diff --git a/locale/ar/LC_MESSAGES/finance.po b/locale/ar/LC_MESSAGES/finance.po index 598e0b8db..dacf79546 100644 --- a/locale/ar/LC_MESSAGES/finance.po +++ b/locale/ar/LC_MESSAGES/finance.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" @@ -544,10 +544,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -571,7 +571,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3887,6 +3887,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "الشروط التجارية" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5700,6 +5791,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7198,10 +7290,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7213,101 +7304,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "تقارير المتابعة" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "تقارير المتابعة" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7319,11 +7442,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7331,15 +7454,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9494,19 +9617,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade ` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install ` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code ` " "for all newly created invoice and refund transactions. Under " @@ -9516,23 +9631,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule ` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9540,7 +9643,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9552,21 +9655,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "رمز السلعة " -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9574,24 +9677,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9599,7 +9702,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9608,39 +9711,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes ` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9651,96 +9754,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9750,73 +9830,73 @@ msgid "" ":ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country `, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value `, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10157,7 +10237,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11228,7 +11308,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11403,52 +11483,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions ` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11456,46 +11517,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module ` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping `." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "التقارير" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12003,70 +12078,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "`__" @@ -12097,7 +12172,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "يدويًا" @@ -13463,330 +13537,919 @@ msgstr "النفقات " #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price `. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "الضبط " -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense `, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses `. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries `. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15395,10 +16058,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "التقارير" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24244,7 +24903,7 @@ msgid "" "works with the following PACs: `Solución Factible " "`_, `Quadrum (formerly Finkok) " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24544,7 +25203,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum `_, `Solución Factible " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29068,7 +29727,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29291,14 +29949,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29306,7 +29964,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29380,26 +30038,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29411,7 +30079,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29421,7 +30089,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29432,36 +30100,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29473,26 +30185,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29502,21 +30214,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30319,7 +31031,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30333,183 +31045,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal `_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal `_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"`, :ref:`PDT `, and :ref:`IPN ` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"` and :ref:`Payment Data Transfer (PDT) ` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees `_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account `_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation `_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account `, then follow " "this `link Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees ` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site `_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees `_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site `_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"`_)." +"`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com `_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/ar/LC_MESSAGES/inventory_and_mrp.po b/locale/ar/LC_MESSAGES/inventory_and_mrp.po index cd70e6d4e..2028f2e09 100644 --- a/locale/ar/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/ar/LC_MESSAGES/inventory_and_mrp.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Malaz Abuidris , 2023\n" "Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" @@ -4725,8 +4725,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4763,7 +4763,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4775,8 +4775,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4784,7 +4784,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4861,16 +4861,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4898,8 +4897,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4940,9 +4939,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/ar/LC_MESSAGES/sales.po b/locale/ar/LC_MESSAGES/sales.po index da42baa29..1dce6603d 100644 --- a/locale/ar/LC_MESSAGES/sales.po +++ b/locale/ar/LC_MESSAGES/sales.po @@ -7,17 +7,17 @@ # Mustafa Rawi , 2023 # Farid Fox, 2023 # Malaz Abuidris , 2023 -# Martin Trigaux, 2023 # Niyas Raphy, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Niyas Raphy, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,6 +76,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1625,8 +1626,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users ` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1635,9 +1637,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1664,41 +1666,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"`, automatically apply the :doc:`attributed " +"pricelist `, or :ref:`generate and print " +"an invoice `." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session `. For instance, to provide cleaning " @@ -1706,14 +1698,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO ` " "are displayed identically in the cart." @@ -1724,7 +1716,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1735,37 +1727,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1775,13 +1767,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1789,27 +1781,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1823,31 +1815,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2402,93 +2394,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS ` and :ref:`keep" +" track of the employees involved in each order `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings ` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge ` or selecting their name from the list of " +"allowed employees to :ref:`open the session `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session `, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "التحليلات" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3852,21 +3861,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "الفواتير" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3878,7 +3887,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3886,23 +3895,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3913,27 +3922,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3943,23 +3952,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3973,7 +3982,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4607,8 +4616,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access ` to the POS and :ref:`use " -"barcodes to log your employees in ` your POS." +":ref:`restrict access ` to the POS and " +":ref:`use barcodes to log your employees in ` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/ar/LC_MESSAGES/websites.po b/locale/ar/LC_MESSAGES/websites.po index 2a5546d87..703c9de54 100644 --- a/locale/ar/LC_MESSAGES/websites.po +++ b/locale/ar/LC_MESSAGES/websites.po @@ -5,17 +5,17 @@ # # Translators: # Mustafa Rawi , 2023 -# Martin Trigaux, 2023 # Malaz Abuidris , 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-13 05:55+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Malaz Abuidris , 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -484,8 +484,9 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 msgid "Configuration" msgstr "التهيئة " @@ -682,7 +683,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1178,6 +1179,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "التحليلات" @@ -1214,7 +1216,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "المنتجات" @@ -1711,24 +1712,23 @@ msgid "" "To add a tax on a product, you can either set a tax in the " ":guilabel:`Customer Taxes` field of the **product template** or use " ":doc:`fiscal positions " -"`." +"`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxes`" +msgid ":doc:`/applications/finance/accounting/taxes`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/avatax`" +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxcloud`" +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 -msgid "" -":doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`" +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 @@ -1778,7 +1778,7 @@ msgid "Tax type displayed on the product page" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/B2B_B2C`" +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 @@ -1821,11 +1821,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1836,12 +1836,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1849,15 +1849,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1865,11 +1865,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1881,15 +1881,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1901,7 +1901,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2839,439 +2839,424 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 +msgid "" +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 +msgid "" +"Essential cookies, which are necessary for the website to function properly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 +msgid "" +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 +msgid "" +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR `_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 +msgid "" +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 +msgid "" +"You can :ref:`customize the appearance of your cookies bar ` and :ref:`edit the content of the related Cookie Policy " +"page `." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 +msgid "" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 +msgid "" +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 +msgid "" +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 +msgid "" +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 +msgid "" +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 +msgid "" +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 +msgid "" +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 +msgid "" +"You could add a link providing access to this page, in your website's " +"footer, for example." +msgstr "" + #: ../../content/applications/websites/website/configuration/multi_website.rst:3 msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name `, theme, pages, " +"menus, :doc:`languages `, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages `." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "الضبط " - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "إضافة خصائص" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website `." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "التسعير" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists `. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "التقارير" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "المدونات" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "المنتديات" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "الفعاليات" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "المناصب الوظيفية" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "قوائم الأسعار" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4647,10 +4632,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "التقارير" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/de/LC_MESSAGES/finance.po b/locale/de/LC_MESSAGES/finance.po index d25d2b45c..ed24bff60 100644 --- a/locale/de/LC_MESSAGES/finance.po +++ b/locale/de/LC_MESSAGES/finance.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: German (https://app.transifex.com/odoo/teams/41243/de/)\n" @@ -560,10 +560,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -587,7 +587,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4183,6 +4183,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterms" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -6007,6 +6098,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7505,10 +7597,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7520,101 +7611,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Mahnberichte" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Mahnberichte" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7626,11 +7749,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7638,15 +7761,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9801,19 +9924,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade ` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install ` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code ` " "for all newly created invoice and refund transactions. Under " @@ -9823,23 +9938,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule ` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9847,7 +9950,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9859,21 +9962,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Warennummer" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9881,24 +9984,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9906,7 +10009,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9915,39 +10018,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes ` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9958,96 +10061,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -10057,73 +10137,73 @@ msgid "" ":ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country `, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value `, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10464,7 +10544,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11628,7 +11708,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11803,52 +11883,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions ` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11856,46 +11917,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module ` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping `." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Berichte" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12432,11 +12507,11 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" -msgstr "VIES-Validierung von USt-Id-Nummern" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" +msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" @@ -12447,7 +12522,7 @@ msgstr "" "Gültigkeit der Umsatzsteuernummern von in der Europäischen Union " "registrierten Unternehmen überprüfen können." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " @@ -12458,7 +12533,7 @@ msgstr "" "Kontakte Ihnen eine gültige Umsatzsteuernummer mitgeteilt haben, ohne die " "Odoo-Oberfläche zu verlassen." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " @@ -12468,15 +12543,15 @@ msgstr "" "Konfiguration --> Einstellungen --> Steuern`, aktivieren Sie die Funktion " "**Verifizierung UST-ID Nummer** und klicken Sie auf *Speichern*." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "Validierung der USt.-Nummer" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." @@ -12484,13 +12559,13 @@ msgstr "" "Wenn Sie einen Kontakt erstellen oder ändern, müssen Sie die Felder **Land**" " und **USt ID** ausfüllen." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." @@ -12499,13 +12574,13 @@ msgstr "" "Umsatzsteuernummernprüfung durch und zeigt eine Fehlermeldung an, wenn die " "Umsatzsteuernummer ungültig ist." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." @@ -12513,7 +12588,7 @@ msgstr "" "Dieses Tool prüft die Gültigkeit der Umsatzsteuernummer, nicht aber die " "Gültigkeit der anderen Felder." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "`__" @@ -12546,7 +12621,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manuell" @@ -13952,432 +14026,920 @@ msgstr "Aufwand" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -"**Odoo Expenses** rationalisiert die Verwaltung von Auslagen. Mitarbeiter " -"können ihre Auslagen einreichen, Manager können sie genehmigen, Buchhalter " -"können sie erfassen und die Auszahlungen verarbeiten." -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "`Odoo Auslagen: Produktseite `_" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "Einstellen der Auslagenarten" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"Der erste Schritt zur Erfassung von Auslagen ist die Konfiguration der " -"Auslagenarten (die in Odoo als Produkte verwaltet werden), die Ihr " -"Unternehmen zulässt, über das Menü *Konfiguration*. Wenn eine bestimmte " -"Auslagen zu einem festen Preis erstattet wird, legen Sie einen Kostenwert " -"für das Produkt fest. Andernfalls belassen Sie die Kosten bei 0,0 und die " -"Mitarbeiter melden die tatsächlichen Kosten pro Auslage." -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "Restaurant:" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" -"Kosten: 0,00 (die Kosten für das Ticket werden auf jeder Ausgabe vermerkt)" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "Reisen mit dem eigenen Auto:" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" -msgstr "" -"Kosten: 0,30 (der vom Unternehmen erstattete Preis pro Kilometer ist " -"festgelegt)" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "Hotel:" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "Andere:" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "Kosten: 0,0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price `. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"` to " +"learn more about units of measure and how to configure them." msgstr "" -"Vergessen Sie nicht, für jede Auslagenart (und ein Konto, wenn Sie Odoo " -"Finanzen verwenden) eine Ausgabensteuer festzulegen. Es ist in der Regel " -"eine gute Praxis, eine Steuer zu verwenden, die mit :ref:`Steuer im Preis " -"enthalten ` konfiguriert ist. Auf diese Weise " -"können die Mitarbeiter Auslagen mit Preisen einschließlich Steuern erfassen," -" was in der Regel erwartet wird." -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "Wie man Auslagen erfasst" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -"Als Mitarbeiter (Mitarbeiter in den Benutzerrechten) können Sie unter " -":menuselection:`Meine Ausgaben --> Meine abzurechnenden Auslagen` Auslagen " -"erfassen." -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" -"Wählen Sie das entsprechende Produkt aus und geben Sie entweder den " -"Gesamtbetrag ein, den Sie bezahlt haben (bei Menge = 1), oder den " -"Stückpreis, wenn die Menge zählbar ist (z. B. Anzahl der " -"Hotelübernachtungen)." #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "Geben Sie das Belegdatum ein." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"`. Taxes will be automatically configured if this " +"is set." msgstr "" -"Wählen Sie, ob Sie die Rechnung selbst bezahlt haben (und eine " -"Rückerstattung erwarten) oder ob das Unternehmen direkt gezahlt hat (z. B. " -"wenn Sie die Kreditkarte ihres Unternehmens verwendet haben)." -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" -"Geben Sie die Rechnungsreferenz an, fügen Sie ggf. eigene Notizen hinzu und " -"hängen Sie ein Foto der Quittung aus dem Chatter an. Das hilft dem Manager " -"und dem Buchhalter, den Beleg zu überprüfen." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "Mit einem Klick auf E-Mails" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "" -"Ermöglichen Sie Ihren Mitarbeitern, ihre Auslagen über eine einfache E-Mail " -"zu erfassen. Machen Sie ein Foto des Belegs und senden Sie ihn per E-Mail, " -"oder leiten Sie einfach eine Rechnung weiter!" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"Das Einzige, was Sie tun müssen, ist, einen E-Mail-Alias in " -":menuselection:`Auslagen --> Konfiguration --> Einstellungen` einzurichten " -"(z.B. *expenses* @mycompany.odoo.com). Aus Sicherheitsgründen werden nur " -"authentifizierte Mitarbeiter-E-Mails (vgl. *Arbeits-E-Mail* im Mitarbeiter-" -"Datensatz) verarbeitet." -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -"Das Auslagenprodukt wird automatisch gesetzt, wenn der Betreff der E-Mail " -"die interne Referenz des Produkts an erster Stelle enthält. Geben Sie den " -"Auslagenbetrag in den Betreff der E-Mail ein, um ihn auch automatisch auf " -"die Auslage zu setzen (z. B. Ref001 Food 100€)." -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "Wie werden Auslagen zur Freigabe eingereicht" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -"Wenn Sie bereit sind, Ihre Auslagen an Ihren Vorgesetzten zu übermitteln (z." -" B. am Ende einer Geschäftsreise oder einmal im Monat), gehen Sie zum Menü " -":menuselection:`Meine Ausgaben --> Meine abzurechnenden Auslagen`. Markieren" -" Sie alle Ausgaben in der Listenansicht und klicken Sie auf " -":menüauswahl:`Aktion --> Einreichen an Manager`. Speichern Sie die neu " -"erstellte Auslagenabrechnung (z.B. Auslagen Satz) und warten Sie, bis Ihr " -"Vorgesetzter sie genehmigt hat." -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -"Sie können Auslagen auch einzeln über die Schaltfläche *An Manager " -"übermitteln* in der Formularansicht \"Meine abzurechnenden Auslagen“ " -"einreichen." -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -"Alle Ihre eingereichten Auslagenbereicht finden Sie unter " -":menuselection:`Auslagen --> Meine Auslagen --> Meine Auslagen`." -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "Wie werden Auslagen genehmigt" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"Personal- und Teamleiter erhalten einen Überblick über alle zu genehmigenden" -" Auslagenabrechnung über das Menü :menuselection:`Auslagen Abrechungen --> " -"Freizugebende Abrechnungen`. Diese Benutzer müssen mindestens die " -"Zugriffsrechte *Officers* für *Expenses* haben." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -"Sie können Auslagenabrechnugen überprüfen, genehmigen oder ablehnen und dank" -" des integrierten Kommunikationstools auch Feedback geben." -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -"Als Teamleiter können Sie die Auslagenabrechnungen Ihrer Teammitglieder " -"leicht finden. Sie müssen als Manager in den Personaldatensatz dieser " -"Mitarbeiter eingetragen werden." -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "Wie buche ich Auslagen in den Finanzen" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"Sobald die Auslagenberichte von den Managern genehmigt wurden, geht die " -"Buchhaltungsabteilung zu :menuselection:`Ausgaben --> Auslagenabrechnung -->" -" Zu buchende Abrechnungen`, um Konten, Produkte und Steuern zu überprüfen. " -"Sie können auf *Abrechnungen buchen* klicken, um die entsprechenden Ausgaben" -" in Ihren Büchern zu verbuchen. Dazu muss der Benutzer die folgenden " -"Zugriffsrechte haben:" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Buchhaltung: Buchhalter oder Berater" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Auslagen: Manager" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"Um eine Auslagenabrechnung zu buchen, muss für den Mitarbeiter eine " -"*Privatadresse* angegeben werden. Wenn Sie beim Buchen eine entsprechende " -"Sperrmeldung erhalten, klicken Sie auf den Mitarbeiter, gehen Sie auf die " -"Registerkarte *Persönliche Informationen* und wählen Sie den Kontakt Ihres " -"Mitarbeiters im Adressbuch aus bzw. legen Sie ihn an. Ein Kontakt wurde " -"automatisch erstellt, wenn diese Person ein Odoo Benutzer ist." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "Wie die Auslagen erstattet werden" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"Sie können nun alle zu erstattenden Auslagenberichte in " -":menuselection:`Ausgaben --> Buchhalter --> Zu zahlende Auslagenberichte` " -"sehen. Um die Zahlung zu erfassen oder per Scheck zu bezahlen, klicken Sie " -"auf *Zahlung erfassen*." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "" -"Sehen Sie, wie Sie den Zahlungsprozess in Odoo einfach verwalten können:" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "Wie Sie Ihren Kunden die Auslagen in Rechnung stellen" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -"Wenn Sie die Auslagen für Kundenprojekte erfassen, können Sie diese " -"automatisch an Ihre Kunden weitergeben." -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Buchhaltung: Buchhalter oder Berater" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Auslagen: Manager" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Einrichten" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "Aktivieren Sie **Kundenabrechnung** in den Auslageneinstellungen" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -"Gehen Sie zum Produktkonfigurationsmenü und legen Sie die Rechnungsmethode " -"für alle Ihre Auslagentypen fest:" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -"Zum Selbstkostenpreis: Die Auslagen werden zu ihren tatsächlichen Kosten in " -"Rechnung gestellt." -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -"Zum Verkaufspreis: Die Rechnung wird auf der Grundlage eines festen " -"Verkaufspreises erstellt, der auf dem Verkaufsauftrag angegeben ist." -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "Einen Auftrag erstellen" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -"Als Verkäufer erstellen und bestätigen Sie einen Kundenauftrag für die an " -"Ihren Kunden erbrachten Dienstleistungen. Wenn Sie im Auftrag keine Auslagen" -" angeben, werden diese automatisch hinzugefügt, sobald sie vom Buchhalter " -"gebucht wurden." -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "Verknüpfen Sie die Auslagen mit dem Verkaufsauftrag." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "Einreichen, Validieren und Buchen von Auslagen" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense `, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -"Vergewissern Sie sich als Manager, dass das analytische Konto für jede " -"Auslagenzeile in den Berichten zur Genehmigung von Auslagen ausgewählt " -"wurde. Klicken Sie auf die Zeile, um es hinzuzufügen, falls es fehlt. Die " -"Mitarbeiter können das Konto bereits bei der Erfassung auswählen ." -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "Als Buchhalter buchen Sie Buchungssätze." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses `. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries `. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "Auslagen in Rechnung stellen" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"Jetzt können Sie die Bestellung in Rechnung stellen. Sie erscheint in " -":menuselection:`Verkauf --> Fakturierung --> Verkauf` Abzurechnen. Die " -"Kosten wurden automatisch in die Auftragszeilen eingefügt. Diese Posten " -"werden in blau angezeigt (d.h. in Rechnung zu stellen)." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "e (z.B. in Rechnung stellen)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -15988,10 +16550,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Berichte" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -25811,7 +26369,7 @@ msgid "" "works with the following PACs: `Solución Factible " "`_, `Quadrum (formerly Finkok) " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -26140,7 +26698,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum `_, `Solución Factible " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -30664,7 +31222,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -30887,14 +31444,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -30902,7 +31459,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -30976,26 +31533,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -31007,7 +31574,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -31017,7 +31584,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -31028,36 +31595,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Adyen Konto" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -31069,26 +31680,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -31098,21 +31709,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -31915,7 +32526,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -31929,183 +32540,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal `_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal `_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"`, :ref:`PDT `, and :ref:`IPN ` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"` and :ref:`Payment Data Transfer (PDT) ` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees `_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account `_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation `_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account `, then follow " "this `link Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees ` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site `_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees `_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site `_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"`_)." +"`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com `_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/de/LC_MESSAGES/inventory_and_mrp.po b/locale/de/LC_MESSAGES/inventory_and_mrp.po index cb6ba686b..f5e81a617 100644 --- a/locale/de/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/de/LC_MESSAGES/inventory_and_mrp.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: German (https://app.transifex.com/odoo/teams/41243/de/)\n" @@ -4728,8 +4728,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4766,7 +4766,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4778,8 +4778,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4787,7 +4787,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4864,16 +4864,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4901,8 +4900,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4943,9 +4942,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/de/LC_MESSAGES/productivity.po b/locale/de/LC_MESSAGES/productivity.po index c9c0eeff8..6b4f390b1 100644 --- a/locale/de/LC_MESSAGES/productivity.po +++ b/locale/de/LC_MESSAGES/productivity.po @@ -3301,7 +3301,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:131 msgid "Convert into 2 columns." -msgstr "" +msgstr "In 2 Spalten umwandeln." #: ../../content/applications/productivity/knowledge/articles_editing.rst:132 msgid ":guilabel:`3 columns`" @@ -3309,7 +3309,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:133 msgid "Convert into 3 columns." -msgstr "" +msgstr "In 3 Spalten umwandeln." #: ../../content/applications/productivity/knowledge/articles_editing.rst:134 msgid ":guilabel:`4 columns`" @@ -3317,7 +3317,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:135 msgid "Convert into 4 columns." -msgstr "" +msgstr "In 4 Spalten umwandeln." #: ../../content/applications/productivity/knowledge/articles_editing.rst:137 msgid "Format" @@ -3430,7 +3430,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:199 msgid "Insert a rating over 3 stars." -msgstr "" +msgstr "Eine Bewertung von 3 Sternen einfügen." #: ../../content/applications/productivity/knowledge/articles_editing.rst:200 msgid ":guilabel:`5 Stars`" @@ -3438,7 +3438,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:201 msgid "Insert a rating over 5 stars." -msgstr "" +msgstr "Eine Bewertung von 5 Sternen einfügen." #: ../../content/applications/productivity/knowledge/articles_editing.rst:212 msgid ":guilabel:`Table of Content`" @@ -3454,7 +3454,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:215 msgid "Show the first level of nested articles." -msgstr "" +msgstr "Erste Ebene verschachtelter Artikel anzeigen." #: ../../content/applications/productivity/knowledge/articles_editing.rst:216 msgid ":guilabel:`Outline`" @@ -3462,7 +3462,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:217 msgid "Show all nested articles." -msgstr "" +msgstr "Alle verschachtelten Artikel anzeigen." #: ../../content/applications/productivity/knowledge/articles_editing.rst:218 msgid ":guilabel:`Item Kanban`" diff --git a/locale/de/LC_MESSAGES/sales.po b/locale/de/LC_MESSAGES/sales.po index 54b24b3f9..27089e1a5 100644 --- a/locale/de/LC_MESSAGES/sales.po +++ b/locale/de/LC_MESSAGES/sales.po @@ -11,17 +11,17 @@ # Thomas, 2023 # Chris Egal , 2023 # Anja Funk , 2023 -# Martin Trigaux, 2023 # Larissa Manderfeld, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Larissa Manderfeld, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: German (https://app.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,6 +80,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1629,8 +1630,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users ` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1639,9 +1641,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1668,41 +1670,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"`, automatically apply the :doc:`attributed " +"pricelist `, or :ref:`generate and print " +"an invoice `." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session `. For instance, to provide cleaning " @@ -1710,14 +1702,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO ` " "are displayed identically in the cart." @@ -1728,7 +1720,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1739,37 +1731,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1779,13 +1771,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1793,27 +1785,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1827,31 +1819,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2406,93 +2398,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS ` and :ref:`keep" +" track of the employees involved in each order `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings ` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge ` or selecting their name from the list of " +"allowed employees to :ref:`open the session `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session `, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analysen" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3856,21 +3865,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Rechnungen" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3882,7 +3891,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3890,23 +3899,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3917,27 +3926,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3947,23 +3956,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3977,7 +3986,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4611,8 +4620,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access ` to the POS and :ref:`use " -"barcodes to log your employees in ` your POS." +":ref:`restrict access ` to the POS and " +":ref:`use barcodes to log your employees in ` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/de/LC_MESSAGES/websites.po b/locale/de/LC_MESSAGES/websites.po index df397cbc5..1058bdcdf 100644 --- a/locale/de/LC_MESSAGES/websites.po +++ b/locale/de/LC_MESSAGES/websites.po @@ -4,8 +4,6 @@ # FIRST AUTHOR , YEAR. # # Translators: -# e2f , 2022 -# Chris Egal , 2022 # Ermin Trevisan , 2022 # Friederike Fasterling-Nesselbosch, 2022 # Kimlong Mai, 2023 @@ -17,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-13 05:55+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: German (https://app.transifex.com/odoo/teams/41243/de/)\n" @@ -489,8 +487,9 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 msgid "Configuration" msgstr "Konfiguration" @@ -687,7 +686,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1183,6 +1182,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analysen" @@ -1219,7 +1219,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Produkte" @@ -1716,24 +1715,23 @@ msgid "" "To add a tax on a product, you can either set a tax in the " ":guilabel:`Customer Taxes` field of the **product template** or use " ":doc:`fiscal positions " -"`." +"`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxes`" +msgid ":doc:`/applications/finance/accounting/taxes`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/avatax`" +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxcloud`" +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 -msgid "" -":doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`" +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 @@ -1783,7 +1781,7 @@ msgid "Tax type displayed on the product page" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/B2B_B2C`" +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 @@ -1826,11 +1824,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1841,12 +1839,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1854,15 +1852,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1870,11 +1868,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1886,15 +1884,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1906,7 +1904,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2895,439 +2893,424 @@ msgstr "" " Sie schöne Websites erstellen, die Besucher in Leads oder Einnahmen " "umwandeln." +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 +msgid "" +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 +msgid "" +"Essential cookies, which are necessary for the website to function properly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 +msgid "" +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 +msgid "" +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR `_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 +msgid "" +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 +msgid "" +"You can :ref:`customize the appearance of your cookies bar ` and :ref:`edit the content of the related Cookie Policy " +"page `." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 +msgid "" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 +msgid "" +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 +msgid "" +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 +msgid "" +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 +msgid "" +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 +msgid "" +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 +msgid "" +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 +msgid "" +"You could add a link providing access to this page, in your website's " +"footer, for example." +msgstr "" + #: ../../content/applications/websites/website/configuration/multi_website.rst:3 msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name `, theme, pages, " +"menus, :doc:`languages `, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages `." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Einrichten" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Features hinzufügen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "usw." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website `." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Preiskalkulation" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists `. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Berichtswesen" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forenverzeichnis" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Veranstaltungen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Offene Stellen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multi-Unternehmen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Preislisten" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4706,10 +4689,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Berichtswesen" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/es/LC_MESSAGES/administration.po b/locale/es/LC_MESSAGES/administration.po index f8f0b1ee3..9deacc8a4 100644 --- a/locale/es/LC_MESSAGES/administration.po +++ b/locale/es/LC_MESSAGES/administration.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" @@ -1699,7 +1699,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "Odoo en línea" @@ -3348,7 +3348,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -5289,6 +5289,8 @@ msgstr ":ref:`odoo_online/users`" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Actualizar" @@ -5923,278 +5925,346 @@ msgstr "Esta tabla muestra el estado de soporte para todas las versiones." msgid "**Major releases are in bold type.**" msgstr "**Las versiones mayores están en negritas.**" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "Local" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "Fecha de lanzamiento" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "Fin del soporte" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" -msgstr "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" +msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "|green|" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "N/A" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "Odoo saas~16.2" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "Marzo de 2023" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" -msgstr "Junio de 2023 (previsto)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" +msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "Odoo saas~16.1" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "Febrero de 2023" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "Abril de 2023" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "**Odoo 16.0**" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "Octubre de 2022" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "Octubre de 2025 (planeado)" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "Odoo saas~15.2" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "|red|" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "Febrero de 2023" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "Abril de 2023" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "**Odoo 16.0**" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "Octubre de 2022" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "Octubre de 2025 (planeado)" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "Odoo saas~15.2" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "Marzo de 2022" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "Enero de 2023" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "Odoo saas~15.1" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "Febrero de 2022" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "Julio de 2022" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "**Odoo 15.0**" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "Octubre de 2021" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "Octubre de 2024 (planeado)" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "**Odoo 14.0**" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "Octubre de 2020" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "Octubre de 2023 (planeado)" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "**Odoo 13.0**" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "Octubre de 2019" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "Odoo saas~12.3" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "Agosto de 2019" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "**Odoo 12.0**" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "Octubre de 2018" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "Odoo saas~11.3" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "Abril de 2018" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "**Odoo 11.0**" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "Octubre de 2017" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "Odoo 10.saas~15" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "Marzo de 2017" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "Odoo 10.saas~14" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "Enero de 2017" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "**Odoo 10.0**" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "Octubre de 2016" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "Odoo 9.saas~11" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "Mayo de 2016" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "**Odoo 9.0**" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "Octubre de 2015" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "Odoo 8.saas~6" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "Febrero de 2015" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "**Odoo 8.0**" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "Septiembre de 2014" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "|green| Versión con soporte" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "|red| Fin del soporte" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "N/A Nunca hubo para esta plataforma" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "🏁 Versión futura, aún no disponible" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "Uso una versión más antigua de Odoo/OpenERP/TinyERP" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" "OpenERP 7.0, 6.1, 6.0 y 5.0 ya no reciben soporte, en ninguna plataforma." -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" "TinyERP 4.0, 3.0, 2.0 y 1.0 ya no reciben soporte, en ninguna plataforma." -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version `_." @@ -6982,7 +7052,7 @@ msgstr "" "secundarios al activarse con mayor frecuencia de la esperada." #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "Submódulos" @@ -7417,7 +7487,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "Etapa de desarrollo" @@ -7597,8 +7667,8 @@ msgid "Tabs" msgstr "Pestañas" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "Historial" @@ -7634,8 +7704,8 @@ msgstr "" "el botón de *conectar*." #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "Correos electrónicos" @@ -7698,7 +7768,7 @@ msgstr "" "Python e incluso consolas de shell de Odoo." #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "Monitoreo" @@ -7719,8 +7789,8 @@ msgstr "" "push de Git, etc.)." #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "Registros" @@ -7783,7 +7853,7 @@ msgstr "" "hacer clic en el botón de Iniciar." #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "Respaldos" @@ -7919,9 +7989,9 @@ msgstr ":doc:`Actualizar - Odoo.sh <../../upgrade/odoo_sh>`" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "Ajustes" @@ -10328,61 +10398,50 @@ msgstr "" "Además, no pueden usar el webshell ni tienen acceso a los registros del " "servidor. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "Usuario" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "Admin" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "conectarse en 1-clic" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "Shell/SSH" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "Producción y Prueba " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "Estado" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "Acceso público " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "Permita que el público acceda a sus compilaciones de desarrollo. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." @@ -10391,7 +10450,7 @@ msgstr "" "pública, permitiéndole a los visitantes conectarse a sus compilaciones de " "desarrollo. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." @@ -10399,7 +10458,7 @@ msgstr "" "Además, los visitantes tienen acceso a los registros, shell y correos " "electrónicos en sus compilaciones de desarrollo. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." @@ -10407,11 +10466,11 @@ msgstr "" "Las compilaciones de producción y de prueba se excluyen, los visitantes solo" " pueden ver sus estados. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "Dominios personalizados" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab `." @@ -10420,7 +10479,7 @@ msgstr "" "configuraciones ` de las ramas" " correspondientes." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." @@ -10428,7 +10487,7 @@ msgstr "" "Configure el despliegue de claves para los repositorios privados que usa " "como submódulos en sus ramas para permitirle a Odoo.sh descargarlos. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -10440,7 +10499,7 @@ msgstr "" " el capítulo :ref:`Submódulos ` de esta " "documentación. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -10452,14 +10511,14 @@ msgstr "" "implementación para Odoo.sh, y así el servidor Git le permita a nuestra " "platafroma descargar las revisiones de este repositorio privado. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" "Para configurar la clave de implementación para el repositorio privado, siga" " las siguientes instrucciones: " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," @@ -10467,11 +10526,11 @@ msgstr "" "en el campo de entrada, pegue la URL SSH de su sub-repositorio privado y " "haga clic en *Agregar*, " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "por ejemplo, *git@github.com:USERNAME/REPOSITORY.git*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" @@ -10479,15 +10538,15 @@ msgstr "" "puede ser otro servidor Git que no sea Github, como Bitbucket, Gitlab o " "inlcuso un servidor que usted mismo aloje" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "copie la clave pública, " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "debe verse como *ssh-rsa caracteres...más...caracteres...aquí...==*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." @@ -10495,26 +10554,26 @@ msgstr "" "en los ajustes del sub-repositorio privado, agregue la clave pública entre " "las claves de implementación" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" "Github.com: :menuselection:`Ajustes --> Claves de implementación --> " "Agrergar clave de implementación`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "" "Bitbucket.com: :menuselection:`Ajustes --> Claves de acceso --> Agregar " "clave`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "" "Gitlab.com: :menuselection:`Ajustes --> Repositorio--> Claves de " "implementación`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" @@ -10522,23 +10581,23 @@ msgstr "" "Alojamiento propio: adjunte la clave al archivo del usuario git " "authorized_keys file en su directorio .ssh" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "Tamaño de almacenaje " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "Esta sección muestra el tamaño de almacenaje que utiliza su proyecto." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "El tamaño de almacenaje se calcula de la siguiente manera: " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "el tamaño de la base de datos de PostgreSQL" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." @@ -10547,7 +10606,7 @@ msgstr "" "datos del repositorio de archivos, directorio del almacenaje de las " "sesiones... " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "`_ in your Web Shell." @@ -10555,7 +10614,7 @@ msgstr "" "En caso de que quiera analizar el uso del disco, puede activar la " "herramienta `ncdu `_ en su Web Shell." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." @@ -10563,11 +10622,11 @@ msgstr "" "Si el tamaño de su base de datos de producción excede lo que cubre su " "suscripción, esta se sincronizará automáticamente con el nuevo tamaño. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "Trabajadores de la base de datos " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " @@ -10578,7 +10637,7 @@ msgstr "" "de datos es capaz de manejar. Si quiere agregar más, automáticmanete se " "sincronizará con su suscripción. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -10593,11 +10652,11 @@ msgstr "" "personalización de este, puede abrir un ticket aquí `here " "`_." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "Ramas de prueba " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " @@ -10607,11 +10666,11 @@ msgstr "" "características al mismo tiempo. Si agrega más, se sincronizará " "automáticamente con su suscripción. " -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "Activación" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index 37a3f4576..e87100fcd 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -19,7 +19,6 @@ # Cinthya Yepez , 2022 # Valentino , 2022 # Cinthya Yepez , 2022 -# AleEscandon , 2022 # Jorge Luis Alfonso , 2022 # José Cabrera Lozano , 2022 # Althay Ramallo Fuentes , 2022 @@ -31,25 +30,26 @@ # marcescu, 2023 # Jesse Garza , 2023 # Lucia Pacheco, 2023 -# Jon Perez , 2023 # Pedro M. Baeza , 2023 -# Braulio D. López Vázquez , 2023 # jabelchi, 2023 # Patricia Gutiérrez Capetillo , 2023 # Leonardo J. Caballero G. , 2023 # Aimée Mendoza Sánchez, 2023 -# Martin Trigaux, 2023 # Iran Villalobos López, 2023 # Fernanda Alvarez, 2023 +# Martin Trigaux, 2023 +# Braulio D. López Vázquez , 2023 +# Jon Perez , 2023 +# AleEscandon , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: AleEscandon , 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -615,10 +615,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -642,7 +642,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4724,6 +4724,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterms" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "Procesos de facturación" @@ -6882,6 +6973,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -8532,10 +8624,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -8547,101 +8638,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Reportes de seguimiento" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Reportes de seguimiento" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -8653,11 +8776,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -8665,15 +8788,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr ":doc:`../../../general/in_app_purchase`" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -11037,19 +11160,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade ` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install ` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code ` " "for all newly created invoice and refund transactions. Under " @@ -11059,23 +11174,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule ` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -11083,7 +11186,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -11095,21 +11198,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "Configuración de productos" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Código de mercancía " -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -11117,24 +11220,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -11142,7 +11245,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -11151,39 +11254,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes ` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -11194,96 +11297,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -11293,73 +11373,73 @@ msgid "" ":ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country `, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value `, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -11750,7 +11830,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -13133,7 +13213,7 @@ msgstr "" " entre Odoo y Avatax." #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr ":doc:`fiscal_positions`" @@ -13364,72 +13444,35 @@ msgstr "Ventas a distancia intracomunitarias en la UE" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -"Las **ventas a distancia en la Unión Europea** incluyen las ventas " -"transfronterizas de bienes y servicios a un consumidor particular (B2C) en " -"otro Estado miembro de la UE cuando el vendedor no se reúne cara a cara con " -"el cliente. Las organizaciones deben asegurarse de que el IVA de las ventas " -"a distancia se paga al Estado miembro en el que se entregan los bienes o " -"servicios." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -"Esto es cierto incluso si su organización se ubica fuera de la Unión " -"Europea." - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" -"La **Ventanilla Única** (OSS, por sus siglas en inglés) de la Unión es un " -"portal en línea en el cual las empresas pueden registrarse y declarar sus " -"ventas intracomunitarias a distancia. Cada uno de los Estados miembros de la" -" UE cuenta con un portal de ventanilla única en línea." #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions ` and :doc:`taxes <../taxes>` based on your " -"company's country." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"`_" -msgstr "" -"`Comisión Europea: OSS | Impuestos y Unión Aduanera " -"`_" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." -msgstr "" -"Vaya a :menuselección:`Contabilidad/Facturación --> Ajustes --> Impuestos`, " -"luego active **venta intracomunitaria a distancia** (o **IVA de bienes " -"digitales de la UE** si creó su base de datos antes del 1 de julio de 2021)," -" y *guarde*." - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" @@ -13437,34 +13480,15 @@ msgstr "" "Función \"ventas a distancia intracomunitarias en la UE\" en los ajustes de " "la aplicación Contabilidad de Odoo." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module ` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping `." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -":ref:`Actualice el módulo ` `l10n_eu_service` si lo instaló" -" antes del **1 de julio de 2021**, o si activó la función **IVA de bienes " -"digitales de la UE** en los ajustes de Contabilidad. Después, asegúrese de " -":ref: `actualizar el mapeo de impuestos `." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "Posiciones fiscales e impuestos" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" -"Una vez activada, la función crea de forma automática todos los impuestos y " -"posiciones fiscales necesarios para cada estado miembro de la UE, según el " -"país de su empresa." - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." @@ -13472,27 +13496,49 @@ msgstr "" "Recomendamos ampliamente que compruebe que el mapeo propuesto es adecuado " "para los productos y servicios que vende antes de utilizarlo." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" -msgstr "Actualizar el mapeo de impuestos" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 -msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -"Cada vez que agregue o modifique impuestos, podrá actualizar automáticamente" -" sus posiciones fiscales." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -"Para hacer esto, vaya a :menuselection:`Contabilidad/Facturación --> Ajustes" -" --> Impuestos --> Venta a distancia intracomunitaria en la UE` y haga clic " -"en el botón *actualizar mapeo de impuestos*." + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Reportes" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +msgid "" +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"`_" +msgstr "" +"`Comisión Europea: OSS | Impuestos y Unión Aduanera " +"`_" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 msgid "Fiscal positions (tax and account mapping)" @@ -14142,11 +14188,11 @@ msgstr "" "impuesto del 7% sobre la mitad del precio, pero esto podría ser inesperado " "desde el punto de vista del usuario." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" -msgstr "Validación de números de IVA en VIES" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" +msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" @@ -14157,7 +14203,7 @@ msgstr "" "Europea que le permite comprobar la validez de los números de IVA de las " "empresas registradas en la Unión Europea. " -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " @@ -14167,7 +14213,7 @@ msgstr "" "se guarda un contacto. Esto le ayuda a asegurarse de que sus contactos le " "proporcionaron un número de IVA válido sin salir de la interfaz de Odoo." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " @@ -14177,16 +14223,16 @@ msgstr "" "Configuración --> Ajustes --> Impuestos`, active la función **verificar " "números de IVA** y haga clic en *guardar*." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" "Habilitar *verificar números de IVA\" en la aplicación Contabilidad de Odoo" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "Validación de número de IVA" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." @@ -14194,7 +14240,7 @@ msgstr "" "Cada vez que cree o modifique un contacto, asegúrese de completar los campos" " **país** e **IVA**." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" @@ -14202,7 +14248,7 @@ msgstr "" "Complete el formulario de contacto con el país y el número de IVA antes de " "hacer clic en *guardar*." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." @@ -14210,7 +14256,7 @@ msgstr "" "Al hacer clic en *guardar*, Odoo ejecuta una validación del número de IVA " "por VIES, y muestra un mensaje de error si el número de IVA no es válido." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" @@ -14218,7 +14264,7 @@ msgstr "" "Cuando el número de IVA no es válido, Odoo muestra un mensaje de error en " "lugar de guardar" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." @@ -14226,7 +14272,7 @@ msgstr "" "Esta herramienta verifica la validez del número de IVA pero no comprueba la " "validez de los demás campos." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "`__" @@ -14259,7 +14305,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manualmente" @@ -15973,432 +16018,921 @@ msgstr "Gastos" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -"**Gastos de Odoo** agiliza la gestión de los gastos. Los empleados pueden " -"introducir sus gastos, los gerentes pueden aprobarlos y los contadores " -"pueden registrarlos y procesar los pagos." -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "" "`Gastos de Odoo: página del producto `_" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "Como configurar los tipos de gasto" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"El primer paso para realizar un seguimiento de los gastos es configurar los " -"tipos de gastos (gestionados como productos en Odoo) que su empresa permite," -" desde el menú *Configuración*. Cuando se reembolsa un gasto específico a un" -" precio fijo, establezca un costo en el producto. De lo contrario, mantenga " -"el costo en 0.0 y los empleados informarán el costo real por gasto." -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" -msgstr "Estos son algunos de los ejemplos:" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." +msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "Restaurante:" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "Costo: 0.00 (el costo del boleto se registrará en cada gasto)" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "Viaje con automóvil personal:" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" -"Costo: 0.30 (el precio por kilómetro reembolsado por la empresa es fijo)" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "Hotel:" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "Otros:" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "Coste: 0.0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price `. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"` to " +"learn more about units of measure and how to configure them." msgstr "" -"No olvide establecer un impuesto de gastos en cada tipo de gasto (y una " -"cuenta si utiliza la aplicación de Contabilidad). Por lo general es una " -"buena práctica utilizar un impuesto que se configura con :ref:`Impuesto " -"incluido en el precio `. De esta manera, los " -"empleados reportan los gastos con los precios incluyendo los impuestos, que " -"suele ser el comportamiento esperado." -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" -"La aplicación de *Ventas* le permite especificar las unidades de medida para" -" sus tipos de gasto (unidades, millas, noches, etc.). Vaya a " -":menuselection:`Ventas --> Configuración --> Ajustes` y marque *Algunos " -"productos se pueden vender/comprar en diferentes unidades de medida " -"(avanzado)*." #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "Cómo registrar gastos" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -"Como empleado (Empleado en los derechos de acceso de usuario), puede " -"registrar los gastos desde :menuselection:`Mis gastos --> Gastos a " -"presentar`." -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" -"Seleccione el producto relacionado e introduzca el importe total que ha " -"pagado (con Cantidad = 1) o el precio unitario si la Cantidad es contable " -"(por ejemplo, número de noches de hotel)." #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "Introduzca la fecha del gasto." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"`. Taxes will be automatically configured if this " +"is set." msgstr "" -"Elija si pagó la factura por su cuenta (y espera el reembolso) o si la " -"empresa pagó directamente (por ejemplo, si utilizó la tarjeta de crédito de " -"una empresa)." -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" -"Establezca la referencia de la factura, añada algunas notas si es necesario " -"y adjunte una foto/escaneo del recibo desde el hilo de discusión. De este " -"modo, será más fácil que el gerente y el contador lo validen." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "Con un solo clic desde los correos electrónicos" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "" -"Deje que sus empleados registren sus gastos desde un simple correo " -"electrónico. Haga una captura del recibo y envíelo por correo electrónico, " -"¡o simplemente reenvíe una factura!" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"Lo único que hay que hacer es configurar un seudónimo de correo electrónico " -"en :menuselection:`Gastos --> Configuración --> Ajustes` (por ejemplo, " -"*gastos* @miempresa.odoo.com). Por motivos de seguridad, sólo se aceptan los" -" correos electrónicos autentificados de los empleados (cfr. *Correo " -"electrónico del trabajo* en el formulario de detalles del empleado)." -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -"El producto correspondiente al gasto se establece de manera automática si el" -" asunto del correo contiene la referencia interna del producto en primera " -"posición. Escriba el importe del gasto en el asunto del correo para " -"establecerlo también en el gasto (por ejemplo, Ref001 Comida 100€)." -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "Cómo enviar los gastos a los gerentes" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -"Cuando esté listo para enviar sus gastos a su gerente (por ejemplo, al final" -" de un viaje de negocios, o una vez al mes), vaya al menú " -":menuselection:`Mis gastos --> Gastos a enviar`. Seleccione todos los gastos" -" de la vista de lista y haga clic en :menuselection:`Acción --> Enviar al " -"gerente`. Guarde el nuevo reporte de gastos (es decir, el conjunto de " -"gastos), y espere a que su gerente lo apruebe." -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -"También puede enviar los gastos uno por uno desde el botón *Enviar al " -"gerente* en la vista del formulario de un gasto." -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -"Puede encontrar todos sus reportes de gastos enviados en " -":menuselection:`Gastos --> Mis Gastos --> Reportes de Gastos`." -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "Cómo aprobar gastos" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"Los gerentes de recursos humanos y de equipo obtienen una descripción " -"general de todos los informes de gastos para validar desde el menú superior " -":menuselection: `Para aprobar -> Informes de gastos para aprobar`. Dichos " -"usuarios deben tener al menos derechos de acceso de *Personal* para los " -"*Gastos*." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -"Pueden revisar los reportes de gastos, aprobarlos o rechazarlos, así como " -"proporcionar retroalimentación gracias a la herramienta integrada de " -"comunicación." -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -"Como gerente de un equipo, puede encontrar fácilmente los reportes de gastos" -" de los miembros de su equipo. Es necesario que se defina como gerente en el" -" formulario detallado de esos empleados." -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "Cómo contabilizar los gastos en la aplicación Contabilidad" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"Una vez que los gerentes aprueban los reportes de gastos, el departamento de" -" contabilidad se dirigirá a :menuselection:`Gastos --> Contador --> Reportes" -" de gastos a contabilizar` para verificar las cuentas, los productos y los " -"impuestos. Pueden hacer clic en *Contabilizar asientos* para contabilizar " -"los asientos relacionados en sus libros. Para hacerlo, el usuario debe tener" -" los siguientes derechos de acceso:" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Contabilidad: Contador o asesor" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Gastos: Responsable" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"Para contabilizar un gasto, debe definir una *Dirección de Domicilio* para " -"el empleado. Si obtiene un mensaje de bloqueo al contabilizar, haga clic en " -"el empleado, vaya a la pestaña *Información personal* y seleccione/cree el " -"contacto de su empleado en la libreta de direcciones. Si esta persona " -"utiliza Odoo, se debe haber creado un contacto de manera automática." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "Cómo reembolsar a los empleados" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"Ahora podrá ver todos los reportes de gastos a reembolsar en " -":menuselección:`Gastos --> Contador --> Reportes de gastos a pagar`. Para " -"registrar el pago o pagar con cheque, haga clic en *Registrar un pago*." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "Vea cómo puede administrar fácilmente el proceso de pago en Odoo:" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "¿Cómo volver a facturar gastos a sus clientes?" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -"Si hace un seguimiento de los gastos de los proyectos de sus clientes, puede" -" cobrarlos automáticamente a sus clientes." -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "Explicación:" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Contabilidad: Contador o asesor" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Gastos: Responsable" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "Volver a facturar los gastos a los clientes." + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Configurar" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" -"Activar la **facturación de clientes** en la configuración de los gastos" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -"Vaya al menú de configuración del producto y establezca el método de " -"facturación de todos sus tipos de gastos:" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -"Cantidades ordenadas: facturará los gastos en función de la cantidad " -"ordenada." -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -"Cantidades entregadas: facturará los gastos en función de la cantidad de " -"gastos" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." -msgstr "Al costo: facturará los gastos según su costo real." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" +msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -"A precio de venta: facturará con base en un precio de venta fijo establecido" -" en la orden de venta." -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "Crear una orden" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -"Como vendedor, cree y confirme una orden de venta para los servicios " -"prestados a su cliente. Si no pone ningún gasto en la orden, se añadirá " -"automáticamente una vez que el contador lo registre." -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "Vincular el gasto a la orden de venta." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "Enviar, validar y registrar gastos" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense `, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -"Como gerente, asegúrese de que la cuenta analítica esté definida en cada " -"línea de gasto en los reportes de aprobación de gastos. Haga clic en la " -"línea para añadir una si hace falta. Los empleados podrán establecer una al " -"momento de enviar el reporte." -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "Como contador, publique asientos de diario." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses `. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries `. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "Gastos de factura" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"Ahora puede facturar la orden. Aparecerá en :menuselection:`Ventas --> " -"Facturación --> Ventas` a facturar. Se añaden automáticamente los gastos en " -"las líneas de la orden. Estos elementos aparecen en azul (ej. a facturar)." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "(ej. a facturar)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -18362,10 +18896,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "Introducir el importe de percepción." -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Reportes" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -29740,14 +30270,8 @@ msgid "" "works with the following PACs: `Solución Factible " "`_, `Quadrum (formerly Finkok) " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" -"Seleccione un proveedor autorizado de certificación y compre timbres " -"fiscales. Por el momento, la localización mexicana en Odoo trabaja con los " -"siguientes proveedores: `Solución Factible " -"`_, `Quadrum (antes Finkok) " -"`_ y `SW Sapien - Smarter Web " -"`_." #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 msgid "" @@ -30148,14 +30672,8 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum `_, `Solución Factible " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" -"Recuerde que debe registrarse directamente con el proveedor autorizado de " -"certificación de su elección antes de comenzar a crear facturas desde Odoo. " -"Están disponibles los siguientes proveedores: `Quadrum " -"`_, `Solución Factible " -"`_ y `SW Sapien - Smarter Web " -"`_." #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 msgid "" @@ -35898,7 +36416,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "Pestaña de credenciales" @@ -36174,14 +36691,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -36189,7 +36706,7 @@ msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -36286,22 +36803,25 @@ msgstr "Clave API y clave de cliente" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -"Para recuperar la clave API y la clave del cliente, inicie sesión en su " -"cuenta de Adyen y vaya a :menuselection:`Desarrolladores --> Credenciales " -"API`. - Si ya tiene un usuario de API, ábralo. - Si no lo tiene aún, haga " -"clic en **Crear nuevas credenciales**. Vaya a :menuselection:`Configuración " -"del servidor --> Autenticación` y copie o genere su **Clave API**. Tenga " -"cuidado y copie su clave API pues no se le permitira obtenerla después sin " -"generar otra nueva. " -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " @@ -36311,11 +36831,11 @@ msgstr "" "copie o genere su **Clave de cliente**. Aquí también puede :ref:`permitir " "que se hagan pagos desde su sitio web `." -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "Clave HMAC" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -36331,7 +36851,7 @@ msgstr "" msgid "Configure a webhook." msgstr "Configure un webhook. " -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -36344,7 +36864,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "Ingrese la notificación URL." -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -36358,41 +36878,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "Genere una clave HMAC y guárdela. " -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "Debe guardar el webhook para finalizar su creación." -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "URL" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 -msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +msgid "API URLs" msgstr "" -"Para recuperar las URL, inicie sesión en su cuenta de Adyen y vaya a " -":menuselection:`Desarrolladores -->URL API`. Seleccione una de las URL " -"listadas junto a :guilabel:`API clásica recurrente` como su :guilabel:`URL " -"API recurrente` y una listada junto a :guilabel:`API de compra` como su " -":guilabel:`URL API de compra`." -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." -msgstr "Obtenga los enlaces para las diferentes API. " +#: ../../content/applications/finance/payment_providers/adyen.rst:96 +msgid "" +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" +msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Cuenta de Adyen" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "Permitir pagos de un origen específico" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -36409,13 +36968,13 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "Permite pagos originados desde un dominio específico. " -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "Hacer una retención de tarjeta de crédito" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." @@ -36423,7 +36982,7 @@ msgstr "" "Adyen le permite capturar un importe manualmente en lugar de hacer una " "directa. " -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " @@ -36433,7 +36992,7 @@ msgstr "" "Odoo, como se explica en :ref:`payment providers documentation " "`." -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -36446,7 +37005,7 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "Configuración del retraso de captura en Adyen " -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" @@ -36456,7 +37015,7 @@ msgstr "" "establecer el **Retraso de captura** a **manual** en Adyen. De lo contrario," " la transacción se bloqueará en el estado de autorizado en Odoo. " -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " @@ -36466,7 +37025,7 @@ msgstr "" "captura parcial desde la interfaz de Adyen, Odoo la considerará como una " "captura completa. " -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -37554,7 +38113,7 @@ msgstr "" "guaradar la información de la tarjeta, etc." #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "Ajustes en Odoo" @@ -37573,254 +38132,131 @@ msgstr "" "de Ogone `." #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal `_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal `_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" -"`Paypal `_ está disponible y es muy utilizado a " -"nivel mundial. No cambia la tarifa de suscripción y crear una cuenta es muy," -" muy fácil. Por eso, lo recomendamos para aquellos que son principiantes en " -"Odoo. Funciona como un flujo perfecto donde el cliente es enviado al sitio " -"web de PayPal para registrar el pago. " #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"`, :ref:`PDT `, and :ref:`IPN ` " +"**must** all be enabled." msgstr "" -"Odoo necesita sus **credenciales API** para conectarse a su cuenta de " -"PayPal, que comprenden:" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." -msgstr "" -"**Correo electrónico**: su dirección de correo electrónico para acceder a " -"PayPal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" +msgstr "Regreso automático" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -"**Token de identidad PDT**: la clave que se usa para verificar la " -"autenticidad de las transacciones. " -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -"**Use las IPN**: si quiere usar la Notificación Instantánea de Pago. Ya está" -" seleccionado, no tiene que cambiarlo. " -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -"Puede copiar sus credenciales desde su cuenta de PayPal y pegarlas en los " -"campos correspondientes en la pestaña **Credenciales**. " -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "Transferencia de datos de pago (PDT)" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -"Para configurar el **Token de identidad**, cambie al :ref:`modo " -"desarrollador ` y obtenga el token siguiendo los pasos de " -"configuración de :ref:`paypal/enable-pdt`." -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"` and :ref:`Payment Data Transfer (PDT) ` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -"Si está usando PayPal en modo de prueba, usando una :ref:`Cuenta Paypal " -"Sandbox `, cambie el **Estado** a *Modo de prueba*. Le " -"recomendamos hacerlo en una base de datos de prueba de Odoo en lugar de usar" -" su base de datos principal. " -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" -msgstr "Pestaña de tarifas " +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" +msgstr "Notificación de pago instantáneo (IPN)" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" -"Puede cobrar tarifas adicionales a sus clientes por pagar con PayPal para " -"cubrir las tarifas de transacción que PayPal le cobra a usted. Una vez " -"redirigido a PayPal, su cliente verá un importe adicional que se aplica al " -"importe de la orden. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" -"Para activar esto, vaya a la configruación de PayPal, a la pestaña " -":guilabel:`Tarifas` en Odoo y acitve la opción :guilabel:`Agregar tarifas " -"adicionales`." - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees `_ to set up fees." -msgstr "" -"Puede consultar las `Tarifas de PayPal " -"`_ para establecer las " -"suyas." - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" -"`Los comerciantes en la UE " -"`_ no tienen permitido cobrar tarifas adicionales por pagar con" -" tarjetas de crédito." - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "Ajustes en Paypal" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" -"Primero, configure su cuenta de PayPal para brindarle a su cliente una " -"experiencia perfecta con Odoo. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." -msgstr "" -"Inicie sesión en su cuenta de PayPal y abra las configuraciones de la " -"cuenta. Luego, vaya a :menuselection:`Menú de la cuenta --> Configuración de" -" la cuenta --> Pagos en línea`." #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" -msgstr "Activar el retorno automático " +msgid "PayPal Account Optional" +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -"La función de **Retorno automático** redirecciona automáticamente a sus " -"clientes a Odoo una vez que el pago ha sido procesado. " -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." -msgstr "" -"Desde la página de configuraciones *Pagos en el sitio web*, vaya a " -":menuselection:`Preferencias del sitio web --> Actualizar --> Retorno " -"automático para pagos en el sitio web` y seleccione **Activado**. Ingrese la" -" direccón de su base de datos de Odoo (por ejemplo, " -"`https://suempresa.odoo.com`) en el campo **URL de retorno**. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." -msgstr "" -"Cualquier URL funcionará. Odoo solo becesita que la opción esté activada " -"pues usa otra URL. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" -"Activar la Transferencia de datos de pago (PDT, por sus siglas en inglés) " - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" -"Active la función *Transferencia de datos de pago* para recibir las " -"confirmaciones de pago inmediatamente. Esta función también muestra el " -"estado del pago a los clientes y verifica la autenticidad de los pagos. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" -"Desde la página de configuraciones *Pagos en el sitio web*, vaya a " -":menuselection:`Preferencias del sitio web --> Actualizar --> Transferencia " -"de datos de pago` y seleccione **Activado**. PayPal muestra su **Token de " -"identidad PDT** tan pronto como se guardan los cambios. " - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "Cuenta de Paypal opcional" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" -"Le aconsejamos que no pida a los clientes que se conecten con una cuenta de " -"Paypal cuando paguen. Permita que paguen con tarjetas de débito o crédito, o" -" podría perder algunas transacciones. Asegúrese de que esta opción esté " -"activada." - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "Formato de mensajes de pago" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 +#: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -"Suponga que utilizó caracteres acentuados (o algo más que caracteres latinos" -" simples) para el nombre de su cliente o para las direcciones. En ese caso, " -"**debe** configurar el formato de codificación de la solicitud de pago que " -"Odoo envía a PayPal. De lo contrario, algunas transacciones fallarán sin " -"avisarle. " -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account `_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -"Para hacerlo, vaya a ` su cuenta de producción `_. Luego, haga clic " -"en *Más opciones* y configure ambos formatos de codificación predeterminados" -" como **UTF-8**." -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "¡Su cuenta de Paypal está lista!" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation `_." -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account `, then follow " "this `link `_ para configurar el " "formato de codificación en un entorno de prueba. " -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" -msgstr "Entorno de prueba" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Credenciales" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:98 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees ` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" -"Gracias a las cuentas de PayPal Sandbox puede probar un flujo de pago " -"completo en Odoo. " #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site `_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees `_ to set up fees." msgstr "" -"Inicie sesión en el `Portal de Paypal para desarrolladores " -"`_ usando sus credenciales de PayPal, lo que " -"crea dos cuentas sandbox: " +"Puede consultar las `Tarifas de PayPal " +"`_ para establecer las " +"suyas." -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "Entorno de prueba" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site `_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"`_)." +"`_);" msgstr "" -"Una cuenta de negocios o profesional (para usar como comerciante, por " -"ejemplo, `pp.merch01-facilitator@example.com " -"`_)." -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com `_)." @@ -37883,20 +38388,17 @@ msgstr "" "Una cuenta personal predeterminada (para usarla como comprador, por ejemplo," " `pp.merch01-buyer@example.com `_)." -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -"Inicie sesión en PayPal sandbox usando la cuenta de comerciante y siga las " -"mismas instrucciones de configuración. Ingrese sus credenciales sandbox en " -"Odoo y asegúrese de que PayPal está establecido en **Modo de prueba**. Le " -"recomendamos hacerlo en una base de datos de prueba de Odoo antes de hacerlo" -" en su base de datos principal. " -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" "Ejecute una transacción de prueba desde Odoo con la cuenta sandbox personal." diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po index 680793394..25f75242b 100644 --- a/locale/es/LC_MESSAGES/general.po +++ b/locale/es/LC_MESSAGES/general.po @@ -8,10 +8,10 @@ # Nicole Kist , 2022 # Jonathan Castillo , 2022 # Pauline Thiry , 2022 +# jabelchi, 2022 # Julián Andrés Osorio López , 2022 # Lina Maria Avendaño Carvajal , 2022 # Fairuoz Hussein Naranjo , 2022 -# jabelchi, 2022 # Lucia Pacheco, 2022 # Marian Cuadra, 2022 # Jesús Alan Ramos Rodríguez , 2022 @@ -22,6 +22,7 @@ # Pablo Rojas , 2023 # Braulio D. López Vázquez , 2023 # Fernanda Alvarez, 2023 +# Iran Villalobos López, 2023 # #, fuzzy msgid "" @@ -30,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-05-30 12:32+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5528,7 +5529,7 @@ msgstr "" #: ../../content/applications/general/users/language.rst:61 msgid ":doc:`../../websites/website/configuration/translate`" -msgstr "" +msgstr ":doc:`../../websites/website/configuration/translate`" #: ../../content/applications/general/users/manage_users.rst:3 msgid "Manage users" @@ -5569,6 +5570,8 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "View of the settings page emphasizing the manage users field in Odoo" msgstr "" +"Vista de la página de ajustes enfatizando el campo de diseño del documento " +"en Odoo" #: ../../content/applications/general/users/manage_users.rst:27 msgid "" @@ -5591,6 +5594,8 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "View of a user’s form emphasizing the access rights tab in Odoo" msgstr "" +"Vista del formulario del usuario enfatizando la pestaña de permisos de " +"acceso en Odoo. " #: ../../content/applications/general/users/manage_users.rst:34 msgid "" @@ -5607,6 +5612,8 @@ msgid "" "View of a user’s form with a notification that the invitation email has been" " sent in Odoo" msgstr "" +"Vista del formulario del usuario con una notificación que dice que el correo" +" de invitación ha sido enviado en Odoo" #: ../../content/applications/general/users/manage_users.rst:42 msgid "" @@ -5630,6 +5637,8 @@ msgid "" "View of a user’s form in developer mode emphasizing the user type field in " "Odoo" msgstr "" +"Vista del formulario de usuario en el modo desarrollador enfatizando el " +"campo de tipo de usuario en Odoo" #: ../../content/applications/general/users/manage_users.rst:53 msgid "" @@ -5688,7 +5697,7 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "Enabling Password Reset in Odoo Settings" -msgstr "" +msgstr "Activando el reestablecimiento de contraseñas en los Ajustes de Odoo" #: ../../content/applications/general/users/manage_users.rst:94 msgid "Send reset instructions to users" @@ -5726,6 +5735,8 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "Example of an email with a password reset link for an Odoo account" msgstr "" +"Ejemplo de un correo electrónico con un enlace para restablecer la " +"contraseña para una cuenta de Odoo. " #: ../../content/applications/general/users/manage_users.rst:114 msgid "Change users’ passwords" @@ -5743,7 +5754,7 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "Change another user's password on Odoo" -msgstr "" +msgstr "Cambie la contraseña de otro usuario en Odoo " #: ../../content/applications/general/users/manage_users.rst:123 msgid "Enter a new password and confirm by clicking on *Change Password*." @@ -5799,6 +5810,7 @@ msgstr "" #: ../../content/applications/general/users/manage_users.rst-1 msgid "View of a user’s form emphasizing the multi companies field in Odoo" msgstr "" +"Vista del formulario del usuario enfatizando el campo multiempresas en Odoo" #: ../../content/applications/general/users/manage_users.rst:152 msgid ":doc:`companies`" @@ -6302,7 +6314,7 @@ msgstr "Vaya a :menuselection: `Aplicaciones` e instale el **Módulo VoIP**." #: ../../content/applications/general/voip/axivox.rst-1 msgid "VoIP module installation on an Odoo database" -msgstr "" +msgstr "Instalación de un módulo VoIP en una base de datos de Odoo" #: ../../content/applications/general/voip/axivox.rst:24 msgid "" @@ -6331,6 +6343,7 @@ msgstr "**Entorno VoIP**: establecido como *Producción*." #: ../../content/applications/general/voip/axivox.rst-1 msgid "Integration of Axivox as VoIP provider in an Odoo database" msgstr "" +"Integración de Axivox como proveedor VoIP en una base de datos de Odoo" #: ../../content/applications/general/voip/axivox.rst:37 msgid "Configure the VOIP user in the Odoo's user" @@ -6359,6 +6372,7 @@ msgstr "**Contraseña SIP**: la *Contraseña SIP* de Axivox" #: ../../content/applications/general/voip/axivox.rst-1 msgid "Integration of Axivox user in the Odoo user preference" msgstr "" +"Integración de un usuario de Axivox en las preferencias de usuario de Odoo " #: ../../content/applications/general/voip/axivox.rst:50 msgid "" @@ -6372,7 +6386,7 @@ msgstr "" #: ../../content/applications/general/voip/axivox.rst:0 msgid "SIP credentials in the Axivox manager" -msgstr "" +msgstr "Credenciales SIP en el gestor de Axivox" #: ../../content/applications/general/voip/axivox.rst:58 msgid "Phone Calls" @@ -6399,7 +6413,7 @@ msgstr "Su número es el proporcionado por Axivox." #: ../../content/applications/general/voip/axivox.rst-1 msgid "Incoming VoIP call in Odoo" -msgstr "Trucada VoIP d'entrada a Odoo" +msgstr "Llamada entrante VoIP en Odoo " #: ../../content/applications/general/voip/axivox.rst:72 msgid "" @@ -6411,7 +6425,7 @@ msgstr "" #: ../../content/applications/general/voip/axivox.rst:0 msgid "\"Missing Parameter\" error message in the Odoo softphone" -msgstr "" +msgstr "Mensaje de error \"Parámetro faltante\" en el softphone de Odoo" #: ../../content/applications/general/voip/axivox.rst:80 msgid "" @@ -6427,7 +6441,7 @@ msgstr "" #: ../../content/applications/general/voip/axivox.rst:0 msgid "\"Incorrect Number\" error message in the Odoo softphone" -msgstr "" +msgstr "Mensaje de error \"Número incorrecto\" en el softphone de Odoo " #: ../../content/applications/general/voip/onsip.rst:3 msgid "Use VoIP services in Odoo with OnSIP" diff --git a/locale/es/LC_MESSAGES/inventory_and_mrp.po b/locale/es/LC_MESSAGES/inventory_and_mrp.po index 237f96f74..516a3be37 100644 --- a/locale/es/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/es/LC_MESSAGES/inventory_and_mrp.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" @@ -5565,8 +5565,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -5603,7 +5603,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -5615,8 +5615,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -5624,7 +5624,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -5701,16 +5701,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -5738,8 +5737,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -5780,9 +5779,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -15533,7 +15532,7 @@ msgstr "" ":guilabel:`Cantidades recibidas`: se crea una factura solamente *después* de" " recibir una parte de la orden. Los productos y cantidades *recibidas* se " "usan para generar un borrador de factura. Un mensaje de error aparecerá si " -"intenta crear una factura de vendedor sin recibir nada. " +"intenta crear una factura de vendedor sin haber recibido nada. " #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst-1 msgid "Bill control policy draft bill error message." @@ -15736,10 +15735,13 @@ msgid "" "viewed under the :guilabel:`Other Information` tab on the purchase order " "form." msgstr "" +"Cuando se confirma una orden de compra, el :guilabel:`Estado de facturación`" +" puede verse en la pestaña :guilabel:`Otra información` en el formulario de " +"la orden de compra. " #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst-1 msgid "Purchase order billing status." -msgstr "" +msgstr "Estado de facturación de la orden de compra. " #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:115 msgid "" @@ -15747,10 +15749,13 @@ msgid "" "could appear as and when they are displayed, depending on the bill control " "policy used." msgstr "" +"A continuación verá una lista de los diferentes estados que puede tener un " +":guilabel:`Estado de facturación` cuando se muestra, dependiendo de la " +"política de control de facturación que utilice. " #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:119 msgid ":guilabel:`Billing Status`" -msgstr "" +msgstr ":guilabel:`Estado de facturación`" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:119 msgid "**Conditions**" @@ -15766,7 +15771,7 @@ msgstr "*Sobre cantidades pedidas*" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:123 msgid ":guilabel:`Nothing to Bill`" -msgstr "" +msgstr ":guilabel:`Nada que facturar`" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:123 msgid "PO confirmed; no products received" @@ -15774,11 +15779,11 @@ msgstr "Orden de compra confirmada, no se han recibido productos" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:123 msgid "*Not applicable*" -msgstr "" +msgstr "*No aplica*" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:125 msgid ":guilabel:`Waiting Bills`" -msgstr "" +msgstr ":guilabel:`Esperando facturas`" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:125 msgid "All/some products received; bill not created" @@ -15790,7 +15795,7 @@ msgstr "Orden de compra confirmada" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:127 msgid ":guilabel:`Fully Billed`" -msgstr "" +msgstr ":guilabel:`Facturado`" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:127 msgid "All/some products received; draft bill created" @@ -15802,16 +15807,16 @@ msgstr "Borrador de factura creado" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst:3 msgid "Manage vendor bills" -msgstr "" +msgstr "Gestione facturas de proveedor" #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst:5 msgid "" "The **Purchase** application allows you to manage your purchase orders, " "incoming products, and vendor bills all seamlessly in one place." msgstr "" -"La aplicación de **Compras** permite que usted maneje las órdenes de " -"compras, los productos entrantes y las facturas de los proveedores, todo en " -"un mismo lugar. " +"La aplicación **Compras** permite que usted maneje las órdenes de compras, " +"los productos entrantes y las facturas de los proveedores, todo en un mismo " +"lugar. " #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst:8 msgid "" @@ -15879,10 +15884,10 @@ msgid "" "install it. Due to certain dependencies, installing Purchase will " "automatically install the **Inventory** and **Accounting** applications." msgstr "" -"Desde la aplicación de **Aplicaciones**, busque el módulo **Compra** y haga " +"Desde la aplicación **Aplicaciones**, busque el módulo **Compra** y haga " "clic en instalar. Debido a ciertas dependencias, al instalar Compra, también" -" se instalarán las aplicaciones de **Inventario** y **Contabilidad** de " -"manera automática." +" se instalarán las aplicaciones **Inventario** y **Contabilidad** de manera " +"automática." #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst:41 msgid "Creating products" @@ -16240,7 +16245,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:3 msgid "Configure reordering rules" -msgstr "" +msgstr "Configure reglas de abastecimiento " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:5 msgid "" @@ -16250,20 +16255,29 @@ msgid "" " a purchase order is automatically created whenever the amount on hand falls" " below a set threshold." msgstr "" +"Para algunos productos, es necesario asegurar que siempre haya una cantida " +"disponible para cualquier momento. Al agregar reglas de abastecimiento a un " +"producto, es posible automatizar el proceso de abastecimiento para que la " +"orden de compra se cree automáticamente en cuanto la cantidad disponible " +"esté por debajo del umbral establecido. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:11 msgid "The *Inventory* module must be installed to use reordering rules." msgstr "" +"El módulo *Inventario* debe estar instalado para usar las reglas de " +"abastecimiento. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:14 msgid "Configure products for reordering" -msgstr "" +msgstr "Configure productos para abastecerlos " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:16 msgid "" "Products must be configured in a specific way before a reordering rule can " "be added to them." msgstr "" +"Los productos deben estar configurados de una manera específica para poder " +"agregarles reglas de abastecimiento. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:18 msgid "" @@ -16274,6 +16288,12 @@ msgid "" "Alternatively, find a product that already exists in the database and click " "into it's product form." msgstr "" +"Empezando desde el módulo :menuselection:`Inventario`, " +":menuselection:`Fabricación`, :menuselection:`Compras`, o " +":menuselection:`Ventas`, vaya a :menuselection:`Productos --> Productos` y " +"haga clic en :guilabel:`Crear` para crear un nuevo producto. También puede " +"elegir un producto ya existente en su base de datos y hacer clic en el " +"formulario del producto. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:23 msgid "" @@ -16282,14 +16302,19 @@ msgid "" "Finally, set the :guilabel:`Product Type` to `Storable Product` under the " ":guilabel:`General Information` tab." msgstr "" +"Luego, en el formulario del prodcuto, active el abastecimiento seleccionando" +" la opción :guilabel:`Se puede comprar` que está debajo del campo " +":guilabel:`Nombre del prodcuto`. Finalmente establezca el :guilabel:`Tipo de" +" producto` a `Producto almacenable` en la pestaña :guilabel:`Información " +"general`. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst-1 msgid "Configure a product for reordering in Odoo." -msgstr "" +msgstr "Configure un producto para abastecer en Odoo. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:32 msgid "Add a reordering rule to a product" -msgstr "" +msgstr "Agregue una regla de abastecimiento a un producto" #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:34 msgid "" @@ -16298,22 +16323,33 @@ msgid "" "that product's form, and then clicking :guilabel:`Create` on the " ":guilabel:`Reordering Rules` dashboard." msgstr "" +"Después de configurar adecuadamente un producto, puede agregar una orden de " +"abastecimiento haciendo clic en la pestaña :guilabel:`Reglas de " +"abastecimiento` que ahora es visible en la parte superior del formulario del" +" prodcuto, y luego haciendo clic en :guilabel:`Crear` en el tablero de " +":guilabel:`Reglas de abastecimiento`. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst-1 msgid "Access reordering rules for a product from the product page in Odoo." msgstr "" +"Acceda a las ordenes de abastecimiento para un producto desde la página del " +"producto en Odoo. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:42 msgid "" "Once created, the reordering rule can be configured to generate purchase " "orders automatically by defining the following fields:" msgstr "" +"Una vez creado, las reglas de abastecimiento se pueden configurar para " +"generar órdenes de compra automáticamente definiendo los siguientes campos: " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:45 msgid "" ":guilabel:`Location` specifies where the ordered quantities should be stored" " once they are received and entered into stock." msgstr "" +"La :guilabel:`Ubicación` especifica dónde se deben almacenar las cantidades " +"ordenadas una vez que se reciben e ingresan a las existencias. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:47 msgid "" @@ -16322,6 +16358,10 @@ msgid "" "hand falls below the minimum quantity, a new purchase order will be created " "to replenish it up to the maximum quantity." msgstr "" +"La :guilabel:`Cantidad mínima` establece el umbral más bajo para la regla de" +" abastecimiento, mientras que la :guilabel:`Cantidad máxima` establece el " +"umbral más alto. Si las existencias disponibles están en la cantidad mínima," +" se creará una orden de compra para reabastecerlas a su cantidad máxima. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:52 msgid "" @@ -16329,6 +16369,10 @@ msgid "" "set to `25` and the stock on hand falls to four, a purchase order will be " "created for 21 units of the product." msgstr "" +"Si la :guilabel:`Cantidad mínima` está establecida en `5` y la " +":guilabel:`Cantidad máxima` está establecida en `25` y las existencias " +"disponibles son cuatro, se creará una orden de compra para adquirir 21 " +"unidades del prodcuto." #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:55 msgid "" @@ -16338,6 +16382,11 @@ msgid "" "resulting stock on hand above what is specified in the :guilabel:`Max " "Quantity` field." msgstr "" +"Puede establecer una :guilabel:`Cantidad múltiple` para ordenar los " +"productos solo por lotes para ciertas cantidades. Dependiendo del npumero " +"establecido, esto puede resultar en la creación de una orden de compra que " +"establecerá las existencias resultantes dsiponibles por arriba de lo " +"especificado en el campo de :guilabel:`Cantidad máxima`. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:61 msgid "" @@ -16345,6 +16394,10 @@ msgid "" "Quantity` is set to order the product in batches of `200`, a purchase order " "will be created for 200 units of the product." msgstr "" +"Si la :guilabel:`Cantidad máxima` está establecida en `100` pero la " +":guilabel:`Cantidad múltiple` está establecida para ordenar el prodcuto en " +"lotes de `200`, se creará una orden de compra para 200 unidades del " +"prodcuto." #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:65 msgid "" @@ -16353,14 +16406,20 @@ msgid "" "it can also be set to units of measurement like `Volume` or `Weight` for " "non-discrete products like water or bricks." msgstr "" +"Las :guilabel:`UdM` especifican la unidad de medida para la cual se ordenará" +" la cantidad. Para productos discretos, esto debe estar establecido en " +"`Unidades`. Sin embargo, también puede estar establecido en unidades de " +"medida como `Volumen` o `Peso` para productos no discretos como agua o " +"ladrillos. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst-1 msgid "Configure the reordering rule in Odoo." -msgstr "" +msgstr "Configure la regla de abastecimiento en Odoo." #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:74 msgid "Manually trigger reordering rules using the scheduler" msgstr "" +"Active manualmente las reglas de abastecimiento usando el planificador " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:76 msgid "" @@ -16369,16 +16428,22 @@ msgid "" "to :menuselection:`Inventory --> Operations --> Run Scheduler`. On the pop-" "up window, confirm the manual action by clicking :guilabel:`Run Scheduler`." msgstr "" +"El planificador activará automáticamente las reglas de abastecimiento, el " +"cual se activa una vez al día de manera predeterminada.Para activar las " +"reglas de abastecimiento manualmente, vaya a :menuselection:`Inventario -->" +" Operaciones --> Activar planificador`." #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:82 msgid "" "Manually triggering reordering rules will also trigger any other scheduled " "actions." msgstr "" +"Active manualmente las reglas de abastecimiento también activará otras " +"acciones planificadas. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:85 msgid "Manage reordering rules" -msgstr "" +msgstr "Gestione las reglas de abastecimiento" #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:87 msgid "" @@ -16386,6 +16451,9 @@ msgid "" "product page's form and select the :guilabel:`Reordering Rules` tab at the " "top of the form." msgstr "" +"Para gestionar las reglas de abastecimiento para un solo prodcuto, vaya a la" +" página del formulario del prodcuto y seleccione la pestaña " +":guilabel:`Reglas de abastecimiento` en la parte superior del formulario. " #: ../../content/applications/inventory_and_mrp/purchase/products/reordering.rst:90 msgid "" @@ -16396,6 +16464,13 @@ msgid "" ":guilabel:`Filters`, :guilabel:`Group By` or triple-dotted menu on the form " "are available to search for and/or organize the reordering rules as desired." msgstr "" +"Para gestionar todas las reglas de abastecimiento para cada producto, vaya a" +" :menuselection:`Inventario --> Configuración --> Reglas de abastecimiento`." +" Desde este tablero, puede realizar las típicas acciones de Odoo en masa " +"como exportar datos o archivar reglas que ya no necesita. También están " +"disponibles los :guilabel:`Filtros`, :guilabel:`Agrupar por` o el menú de " +"tres puntos del formulario para que busque y/u organice las reglas de " +"abastecimiento que desee. " #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:3 msgid "Purchase in different units of measure than sales" @@ -16444,12 +16519,12 @@ msgid "" "Open your Sales app and go to :menuselection:`Configuration --> Settings`. " "Under Product Catalog, enable *Units of Measure*." msgstr "" -"Abra la aplicación de Ventas y vaya a :menuselection:`Configuración --> " +"Abra la aplicación Ventas y vaya a :menuselection:`Configuración --> " "Ajustes`. Abajo del catálogo del producto, habilite *Unidades de medida*." #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Enable the units of measure option in Odoo Sales" -msgstr "" +msgstr "Habilite la opción de unidades de medida en Ventas de Odoo" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:29 msgid "Specify sales and purchase units of measure" @@ -16509,7 +16584,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Configure a product's units of measure in Odoo" -msgstr "" +msgstr "Configure las unidades de medida de un producto en Odoo " #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:56 msgid "Create new units of measure and units of measure categories" @@ -16546,7 +16621,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Create a new units of measure category in Odoo Purchase" -msgstr "" +msgstr "Cree una nueva categorría de unidades de medida en Compras de Odoo" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:73 msgid "" @@ -16581,7 +16656,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Create a new reference unit of measure in Odoo Purchase" -msgstr "" +msgstr "Cree una nueva unidad de medida de referencia en Compras de Odoo" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:89 msgid "" @@ -16638,7 +16713,7 @@ msgstr "Para el rollo de cortina, debe establecer un ratio de 100." #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Create a second unit of measure in Odoo Purchase" -msgstr "" +msgstr "Cree una segunda unidad de medida en Compras de Odoo" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst:112 msgid "" @@ -16651,3 +16726,5 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/purchase/products/uom.rst-1 msgid "Set a product's units of measure using your own units in Odoo Purchase" msgstr "" +"Establezca una unidad de medida en un producto usando sus propias unidades " +"en Compras de Odoo" diff --git a/locale/es/LC_MESSAGES/marketing.po b/locale/es/LC_MESSAGES/marketing.po index cf1f6bd05..0444c0ef6 100644 --- a/locale/es/LC_MESSAGES/marketing.po +++ b/locale/es/LC_MESSAGES/marketing.po @@ -12,6 +12,7 @@ # Martin Trigaux, 2023 # Pedro M. Baeza , 2023 # Fernanda Alvarez, 2023 +# Iran Villalobos López, 2023 # #, fuzzy msgid "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-05-02 14:02+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4474,18 +4475,27 @@ msgid "" "The pivot view option provides numerous analytical options, allowing for in-" "depth, detailed analysis of various posts." msgstr "" +"La opción de vista de tabla dinámica proporciona varias opciones de " +"análisis, brindándole un análisis para profundo y detallado de varias " +"publicaciones. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:259 msgid "" "Click on any :guilabel:`+ (plus sign) icon` next to a line in the pivot " "table to reveal more metric options to add to the grid." msgstr "" +"Haga clic en cualquier :guilabel:`ícono + (signo de mas)` junto a una línea " +"en la tabla dinámica para mostrar más opciones métricas que puede agregar a " +"la cuadrícula. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:262 msgid "" "While in the pivot view, the option to :guilabel:`Insert in Spreadsheet` is " "available, located to the right of the :guilabel:`Measures` drop-down." msgstr "" +"Mientras está en la vista de tabla dinámica, estará disponible la opción de " +":guilabel:`Insertar en una hoja de cálculo`, que se encuentra a la derecha " +"del menú desplegable :guilabel:`Medidas`. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:265 msgid "" @@ -4493,34 +4503,46 @@ msgid "" "a current spreadsheet is available. The option to create a new spreadsheet " "for this information on-the-fly is also available in this pop-up, as well." msgstr "" +"Al hacer clic, aparece una ventana emergente, donde estará disponible la " +"opción de agregar estos datos a la hoja de cálculo actual. La opción de " +"crear una nueva hoja de cálculo para estos datos de manera inmediata también" +" está disponible en esta ventana emergente. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:269 msgid "" "Next to the :guilabel:`Insert in Spreadsheet` are three view options, " "specific to the pivot view." msgstr "" +"Junto a la opción :guilabel:`Insertar en una hoja de cálculo` hay tres " +"opciones de vista específicas de la vista de tabla dinámica. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:272 msgid "From left to right, the options are:" -msgstr "" +msgstr "De izquierda a derecha, las opciones son: " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:274 msgid "" ":guilabel:`Flip Axis`, which switches the *X* and *Y* axis in the grid " "table." msgstr "" +":guilabel:`Voltear eje`, voltea los ejes *X* e *Y* en la tabla de " +"cuadrícula." #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:275 msgid "" ":guilabel:`Expand All`, which expands each line in the grid, revealing more " "detailed information related to it." msgstr "" +":guilabel:`Expandir todo`, expande cada línea en la cuadrícula, mostrando " +"más información detallada relacionada. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:277 msgid "" ":guilabel:`Download`, which, when clicked, instantly downloads the pivot " "table as a spreadsheet." msgstr "" +":guilabel:`Descargar`, al hacer clic, descarga de manera instantánea la " +"tabla dinámica como una hoja de cálculo." #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:281 msgid "Visitors" @@ -4532,10 +4554,14 @@ msgid "" " connected to the database, navigate to :menuselection:`Social Marketing -->" " Visitors` in the header menu." msgstr "" +"Para ver un resumen completo de todas las personas que han visitado el sitio" +" web conectado a la base de datos, vaya a :menuselection:`Marketing Social " +"--> Visitantes` en el menú del encabezado. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst-1 msgid "View of the Visitors page in the Odoo Social Marketing application." msgstr "" +"Vista de la página de visitantes en la aplicación Marketing Social de Odoo. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:290 msgid "" @@ -4543,6 +4569,10 @@ msgid "" "information in a default kanban view. This same information can be sorted " "via the :guilabel:`Filters` and :guilabel:`Group By` options." msgstr "" +"Aquí, Odoo proporciona una página detallada de toda la información " +"pertinente de los visitantes en la vista predefinida Kanban. Esta misma " +"información se puede ver a través de los :guilabel:`Filtros` y las opciones " +"de :guilabel:`Agrupar por`. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:294 msgid "" @@ -4550,10 +4580,13 @@ msgid "" " are located in the upper-right corner of the :guilabel:`Visitors` page " "beneath the search bar." msgstr "" +"Los datos de los visitantes también se pueden ver en forma de lista o de " +"gráfico. Estas opciones de vista se ubican en la esquina superior derecha de" +" la página :guilabel:`Visitantes` debajo de la barra de búsqueda. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:298 msgid "Social media page" -msgstr "" +msgstr "Página de redes sociales " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:300 msgid "" @@ -4561,21 +4594,28 @@ msgid "" " all social media options: :guilabel:`Facebook`, :guilabel:`LinkedIn`, " ":guilabel:`Twitter`, and :guilabel:`Push Notifications`." msgstr "" +"Vaya a :menuselection:`Configuración --> Redes sociales` para ver una " +"recopilación de todas las opciones para redes sociales: " +":guilabel:`Facebook`, :guilabel:`LinkedIn`, :guilabel:`Twitter`, y las " +":guilabel:`Notificaciones Push `. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst-1 msgid "" "View of the social media page in the Odoo Social Marketing application." msgstr "" +"Vista de la página de redes sociales en la aplicación de Marketing Social. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:308 msgid "" "If no account has been linked to any particular social media, click " ":guilabel:`Link Account` to proceed through the linking process." msgstr "" +"Si no hay una cuenta vinculada a ninguna red social en particular, haga clic" +" en :guilabel:`Vincular cuenta` para ir al proceso de vinculación. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:312 msgid "Social accounts page" -msgstr "" +msgstr "Página de cuentas de redes sociales " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:314 msgid "" @@ -4584,11 +4624,17 @@ msgid "" "the :guilabel:`Medium Name` and the :guilabel:`Social Media` platform it is " "associated with." msgstr "" +"Para ver una lista de todas las cuentas vinculadas a la base de datos, vaya " +"a :menuselection:`Configuración --> Cuentas de redes sociales `. Esta página" +" le mostrará el :guilabel:`Nombre del medio` y la plataforma de " +":guilabel:`Red social` a la que está asociado. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst-1 msgid "" "View of the social accounts page in the Odoo Social Marketing application." msgstr "" +"Vista de la página de cuentas de redes sociales en la aplicación de " +"Marketing Social de Odoo. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:322 msgid "" @@ -4596,10 +4642,14 @@ msgid "" "the list on this page, and proceed to make any adjustments necessary. Don't " "forget to hit :guilabel:`Save` to secure any changes." msgstr "" +"Para editar/modificar cualquier cuenta de redes sociales, simplemente " +"seleccione la cuenta deseada en la lista de esta página, y luego haga los " +"ajustes que crea necesarios. No olvide presionar el botón de " +":guilabel:`Guardar` para asegurar los cambios. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:327 msgid "Social streams page" -msgstr "" +msgstr "Página de flujos sociales " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:329 msgid "" @@ -4608,6 +4658,10 @@ msgid "" "added to the main dashboard of the *Social Marketing* app, accessible via " "the :guilabel:`Feed` option in the header menu." msgstr "" +"Vaya a :menuselection:`Configuración --> Flujos sociales` para mostrar una " +"página separada que contiene todos los flujos sociales que se agregaron al " +"tablero principal de la aplicación *Marketing Social* , accesible a través " +"de la opción :guilabel:`Feed` en el menú del encabezado. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:337 msgid "" @@ -4616,6 +4670,10 @@ msgid "" ":guilabel:`Type` of the stream (e.g. :guilabel:`Posts`, :guilabel:`Keyword`," " etc.)." msgstr "" +"Aquí, la infromación del flujo social se organiza en una lista con las " +":guilabel:`Redes sociales`, el :guilabel:`Título` del flujo y el " +":guilabel:`Tipo` (por ejemplo, :guilabel:`Publicaciones`, :guilabel:`Palabra" +" clave`, etc.). " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:341 msgid "" @@ -4623,11 +4681,15 @@ msgid "" " list, and proceed to make any necessary adjustments. Don't forget to hit " ":guilabel:`Save` to secure any changes." msgstr "" +"Para modificar la información de cualquier flujo, simplemente haga clic en " +"el flujo que desee de la lista y haga los ajustes que crea necesarios. No " +"olvide presionar el botón de :guilabel:`Guardar` para asegurar los cambios. " #: ../../content/applications/marketing/social_marketing/essentials/social_essentials.rst:345 msgid "" ":doc:`/applications/marketing/social_marketing/essentials/social_campaigns`" msgstr "" +":doc:`/applications/marketing/social_marketing/essentials/social_campaigns`" #: ../../content/applications/marketing/surveys.rst:5 msgid "Surveys" @@ -4778,15 +4840,15 @@ msgstr "Elija uno de los siguientes :guilabel:`tipos de preguntas`:" #: ../../content/applications/marketing/surveys/create.rst:57 msgid ":guilabel:`Multiple Lines Text Box`" -msgstr "" +msgstr ":guilabel:`Cuadro de texto con múltiples líneas`" #: ../../content/applications/marketing/surveys/create.rst:58 msgid ":guilabel:`Single Line Text Box`" -msgstr "" +msgstr ":guilabel:`Cuadro de texto son una línea`" #: ../../content/applications/marketing/surveys/create.rst:59 msgid ":guilabel:`Numerical Value`" -msgstr "" +msgstr ":guilabel:`Valor númerico`" #: ../../content/applications/marketing/surveys/create.rst:60 msgid ":guilabel:`Date`" @@ -4794,19 +4856,19 @@ msgstr ":guilabel:`Fecha`" #: ../../content/applications/marketing/surveys/create.rst:61 msgid ":guilabel:`Datetime`" -msgstr "" +msgstr ":guilabel:`Fecha y hora`" #: ../../content/applications/marketing/surveys/create.rst:62 msgid ":guilabel:`Multiple choice: only one answer`" -msgstr "" +msgstr ":guilabel:`Opción múltiple: solo una respuesta`" #: ../../content/applications/marketing/surveys/create.rst:63 msgid ":guilabel:`Multiple choice: multiple answers allowed`" -msgstr "" +msgstr ":guilabel:`Opción múltiple: se permiten varias respuestas`" #: ../../content/applications/marketing/surveys/create.rst:64 msgid ":guilabel:`Matrix`" -msgstr "" +msgstr ":guilabel:`Matriz`" #: ../../content/applications/marketing/surveys/create.rst:67 msgid "" @@ -4815,10 +4877,14 @@ msgid "" ":guilabel:`Description` tab always remains the same, regardless of what " "question is chosen." msgstr "" +"Aparecerán diferentes funciones en las pestañas :guilabel:`Respuestas` y " +":guilabel:`Opciones`, dependiendo del :guilabel:`Tipo de pregunta` elegida. " +"Sin embargo, la pestaña :guilabel:`Descripción` siempre queda igual, sin " +"importar cual sea la pregunta elegida. " #: ../../content/applications/marketing/surveys/create.rst:72 msgid "Create sections and questions" -msgstr "" +msgstr "Crear secciones y preguntas" #: ../../content/applications/marketing/surveys/create.rst:74 msgid "" @@ -4827,54 +4893,73 @@ msgid "" "the :guilabel:`Answers` (if applicable), :guilabel:`Description`, and " ":guilabel:`Options` tabs." msgstr "" +"Una vez que seleccionó un :guilabel:`Tipo de pregunta` hay tres posibles " +"pestañas donde puede personalizar la información para la pregunta. Estas " +"incluyen las pestañas de guilabel:`Respuestas` (si aplica), " +":guilabel:`Descripción` y :guilabel:`Opciones`. " #: ../../content/applications/marketing/surveys/create.rst:78 msgid "" "Each tab offers a variety of different features depending on what " ":guilabel:`Question Type` was chosen." msgstr "" +"Cada pestaña ofrece una variedad diferentes de funciones dependiendo de qué " +":guilabel:`Tipo de pregunta` escogió. " #: ../../content/applications/marketing/surveys/create.rst:81 msgid "" "For example, in the :guilabel:`Options` tab, the following options may " "appear:" msgstr "" +"Por ejemplo, en la pestaña de :guilabel:`Opciones`, pueden aparecer las " +"siguientes opciones: " #: ../../content/applications/marketing/surveys/create.rst:83 msgid ":guilabel:`Mandatory Answer`: the question must be answered." -msgstr "" +msgstr ":guilabel:`Respuesta obligatoria`: debe responder la pregunta." #: ../../content/applications/marketing/surveys/create.rst:84 msgid "" ":guilabel:`Matrix Type`: for matrix-type questions, select if one choice or " "multiple choices can be selected per row." msgstr "" +":guilabel:`Tipo de matriz`: para preguntas de tipo matriz, seleccione si se " +"puede seleccionar una o más opciones por fila. " #: ../../content/applications/marketing/surveys/create.rst:86 msgid ":guilabel:`Number of columns`: select how many columns are displayed." msgstr "" +":guilabel:`Número de caolumnas`: seleccione cuántas columnas se muestran." #: ../../content/applications/marketing/surveys/create.rst:87 msgid ":guilabel:`Images on answers`: allow images on the answer options." msgstr "" +":guilabel:`Imágenes en las respuestas`: permita las imágenes en las opciones" +" de respuesta." #: ../../content/applications/marketing/surveys/create.rst:88 msgid "" ":guilabel:`Conditional Display`: determine if the question is displayed " "based on the participant's answer to a previous question." msgstr "" +":guilabel:`Visualización condicional`: determina si la pregunta se muestra " +"con base en la respuesta del participante de una pregunta previa. " #: ../../content/applications/marketing/surveys/create.rst:90 msgid "" ":guilabel:`Show Comments Field`: allow the participant to type a comment in " "a text box." msgstr "" +":guilabel:`Mostrar campo de comentarios`: permita al participante escribir " +"un comentario en un cuadro de texto. " #: ../../content/applications/marketing/surveys/create.rst:91 msgid "" ":guilabel:`Question Time Limit`: for live session surveys, set a time limit " "for the question." msgstr "" +":guilabel:`Tiempo límite de la pregunta`: para las encuestas en sesiones en " +"vivo, establezca un tiempo límite para la pregunta." #: ../../content/applications/marketing/surveys/create.rst:94 msgid "Conditional Display" @@ -4885,6 +4970,9 @@ msgid "" ":guilabel:`Conditional Display` means the question is only displayed if the " "specified conditional answer has been selected in a previous question." msgstr "" +":guilabel:`Visualización condicional` significa que la pregunta solo es " +"visible si se seleccionó la respuesta condicional específica en la pregunta" +" anterior. " #: ../../content/applications/marketing/surveys/create.rst:99 msgid "" @@ -4892,12 +4980,19 @@ msgid "" ":guilabel:`Triggering Question` field appears. Select a question from the " "survey." msgstr "" +"Cuando está seleccionada la casilla que está junto a " +":guilabel:`Visualización condicional`, aparecerá el campo de " +":guilabel:`Pregunta desencadenante`. Seleccione una pregunta de la encuesta." +" " #: ../../content/applications/marketing/surveys/create.rst:102 msgid "" "Then, a :guilabel:`Triggering Answer` field appears. Here, select which " "answer will trigger this :guilabel:`Conditional Display` question." msgstr "" +"Luego, aparecerá un campo de :guilabel:`Respuesta desencadenante`. " +"Seleccione que respuesta desencadenará la pregunta configurada como " +":guilabel:`Visualización condicional`." #: ../../content/applications/marketing/surveys/create.rst:106 msgid "Options tab" @@ -4908,51 +5003,58 @@ msgid "" "Back on the main survey template form, under the :guilabel:`Options` tab, " "there are different sections of settings that can be modified." msgstr "" +"En la plantilla del formulario de la encuesta principal, en la pestaña " +":guilabel:`Opciones`, hay secciones de ajustes que puede modificar. " #: ../../content/applications/marketing/surveys/create.rst:111 msgid "The sections include:" -msgstr "" +msgstr "Estas secciones incluyen: " #: ../../content/applications/marketing/surveys/create.rst:113 msgid "" ":guilabel:`Questions`: focuses on the overall presentation of the survey" msgstr "" +":guilabel:`Preguntas`: se enfoca en la presentación general de la encuesta" #: ../../content/applications/marketing/surveys/create.rst:114 msgid ":guilabel:`Scoring`: decides how the survey is scored" -msgstr "" +msgstr ":guilabel:`Puntaje`: establece como se califica la encuesta " #: ../../content/applications/marketing/surveys/create.rst:115 msgid ":guilabel:`Candidates`: manages access to the survey" -msgstr "" +msgstr ":guilabel:`Candidatos`: gestiona el acceso a la encuesta " #: ../../content/applications/marketing/surveys/create.rst:116 msgid "" ":guilabel:`Live Session`: enables the survey into a real-time group " "activity." msgstr "" +":guilabel:`Sesión en vivo`: convierte la encuesta en una actividad grupal en" +" tiempo real. " #: ../../content/applications/marketing/surveys/create.rst:119 msgid "Questions" -msgstr "Cuestionario" +msgstr "Preguntas" #: ../../content/applications/marketing/surveys/create.rst:121 msgid "" "First, select the :guilabel:`Layout` of the survey. The following options " "can be chosen:" msgstr "" +"Primero, seleccione el :guilabel:`Diseño` de la encuesta. Puede elegir de " +"entre las siguientes opciones: " #: ../../content/applications/marketing/surveys/create.rst:123 msgid ":guilabel:`One page with all the questions`" -msgstr "" +msgstr ":guilabel:`Una página con todas las preguntas`" #: ../../content/applications/marketing/surveys/create.rst:124 msgid ":guilabel:`One page per section`" -msgstr "" +msgstr ":guilabel:`Una página por sección`" #: ../../content/applications/marketing/surveys/create.rst:125 msgid ":guilabel:`One page per question`" -msgstr "" +msgstr ":guilabel:`Una página por pregunta`" #: ../../content/applications/marketing/surveys/create.rst:127 msgid "" @@ -4961,6 +5063,10 @@ msgid "" "appears. If selected, the :guilabel:`Back Button` option allows the " "participant to go back to a question during the survey." msgstr "" +"Si selecciona la opción :guilabel:`Una página por sección` o :guilabel:`Una " +"página por pregunta`, aparecerá la opción :guilabel:`Botón de retroceso`. Si" +" selecciona la opción de :guilabel:`Botón de retroceso`, el participante " +"podrá regresar a una pregunta mientras repsonde la encuesta. " #: ../../content/applications/marketing/surveys/create.rst:131 msgid "" @@ -4969,6 +5075,10 @@ msgid "" " displayed. It is shown as either a :guilabel:`Percentage` or a " ":guilabel:`Number`." msgstr "" +"Entre las opciones de :guilabel:`Diseño` se encuentra el ajuste de " +":guilabel:`Mostrar progreso como`, que indica cómo se muestra el progreso " +"del participante. Se muestra como un :guilabel:`Porcentaje` o un " +":guilabel:`Número`. " #: ../../content/applications/marketing/surveys/create.rst:135 msgid "" @@ -4976,6 +5086,10 @@ msgid "" "To implement this option, simply check the box, and enter the amount of time" " (in minutes) participants have to complete the survey." msgstr "" +"Después, hay una opción disponible para agregar un :guilabel:`Tiempo límite " +"de la encuesta`. Para activar esta opción, simplemente seleccione la casilla" +" e introduzca la cantidad de tiempo (en minutos) que tienen los " +"participantes para terminar la encuesta. " #: ../../content/applications/marketing/surveys/create.rst:139 msgid "" @@ -4984,6 +5098,11 @@ msgid "" "section`, in other words, the number of random questions can be configured " "by section. This mode is ignored in a live session." msgstr "" +"Después de la opción :guilabel:`Tiempo límite de la encuesta` hay una " +"sección llamada :guilabel:`Selección de preguntas`. Aquí, puede seleccionar " +"que las preguntas aparezcan :guilabel:`Aleatorio por sección`, es decir, " +"puede configurar el número de preguntas aleatorias por sección. Esta opción " +"no se toma en cuenta en las sesiones en vivo. " #: ../../content/applications/marketing/surveys/create.rst:144 #: ../../content/applications/marketing/surveys/scoring.rst:56 @@ -4999,18 +5118,20 @@ msgid "" "The following options are available when deciding how a :guilabel:`Scoring` " "method:" msgstr "" +"Al decidir de qué manera aparecerá la :guilabel:`Puntuación` podrá escoger " +"de entre las siguientes opciones: " #: ../../content/applications/marketing/surveys/create.rst:151 msgid ":guilabel:`No scoring`" -msgstr "" +msgstr ":guilabel:`Sin puntaje`" #: ../../content/applications/marketing/surveys/create.rst:152 msgid ":guilabel:`Scoring with answers at the end`" -msgstr "" +msgstr ":guilabel:`Puntaje con respuestas al final`" #: ../../content/applications/marketing/surveys/create.rst:153 msgid ":guilabel:`Scoring without answers at the end`" -msgstr "" +msgstr ":guilabel:`Puntaje sin respuestas al final`" #: ../../content/applications/marketing/surveys/create.rst:155 msgid "" @@ -5019,6 +5140,10 @@ msgid "" ":guilabel:`Success %` field appears. Set the percentage of correct answers " "needed to pass the survey." msgstr "" +"Si selecciona la opción :guilabel:`Puntaje con respuestas al final` o " +":guilabel:`Puntaje din respuestas al final`, aparecerá un campo de " +":guilabel:`Porcentaje de puntaje obligatorio`. Establezca el puntaje de " +"respuestas correctas necesarias para aprobar la encuesta. " #: ../../content/applications/marketing/surveys/create.rst:159 msgid "" @@ -5030,6 +5155,13 @@ msgid "" "score, an email from Odoo will automatically be sent to that person using " "the selected email template." msgstr "" +"Luego, tendrá la opción de convertir la encuesta en una certificación. Para " +"hacerlo, seleccione la casilla que está junto a la opción :guilabel:`Es una " +"certificación` y aparecerán otros dos campos. Seleccione un color en el " +"campo :guilabel:`Plantilla de la certificación` y luego elija una " +":guilabel:`Plantilla de correo electrónico`. Cuando un participante aprueba " +"la certificación con el puntaje requerido, se le enviará automáticamente un " +"correo usando la plantilla seleccionada. " #: ../../content/applications/marketing/surveys/create.rst:165 msgid "" @@ -5037,6 +5169,9 @@ msgid "" ":guilabel:`Certification Badge` is set, the survey participant also receives" " a badge upon passing the certification." msgstr "" +"Si la función :guilabel:`Dar insignia` está activada y está establecida la " +"opción :guilabel:`Insignia de certificación`, el participante también " +"recibirá una insignia al aprobar la certificación. " #: ../../content/applications/marketing/surveys/create.rst:169 #: ../../content/applications/marketing/surveys/time_random.rst:48 @@ -5045,7 +5180,7 @@ msgstr ":doc:`scoring`" #: ../../content/applications/marketing/surveys/create.rst:172 msgid "Candidates" -msgstr "Candidatos" +msgstr "Participantes " #: ../../content/applications/marketing/surveys/create.rst:174 msgid "" @@ -5053,6 +5188,9 @@ msgid "" "options to choose between: :guilabel:`Anyone with the link` and " ":guilabel:`Invited people only`." msgstr "" +"Para determinar el acceso a la encuesta, el :guilabel:`Modo de acceso` le " +"permite escoger de entre dos opciones: :guilabel:`Cualquier persona que " +"tenga el enlace` y :guilabel:`Solo personas con invitación`. " #: ../../content/applications/marketing/surveys/create.rst:177 msgid "" @@ -5062,6 +5200,12 @@ msgid "" "also populates, in which the number of survey attempts is defined for the " "participant." msgstr "" +"Debajo de la casilla :guilabel:`Evaluación solo para gerentes`, está la " +"opción de :guilabel:`Se requiere inicio de sesión` para solicitarle al " +"participante que inicie sesión para realizar la encuesta. Si está activada " +"esta opción, también se completará un campo de :guilabel:`Limitar " +"intentos`, en el cual se definen el número de intentos que tiene el " +"participante para realizar la encuesta. " #: ../../content/applications/marketing/surveys/create.rst:182 msgid "Live Session" @@ -5073,6 +5217,9 @@ msgid "" "conducting surveys in real-time, wherein they directly engage with and " "collect answers from a live audience." msgstr "" +"La sección :guilabel:`Sesión en vivo` está dedicada a los usuarios que " +"realizan encuestas en tiempo real, donde interactúan y obtienen respuestas " +"de una audiencia en vivo. " #: ../../content/applications/marketing/surveys/create.rst:187 msgid "" @@ -5082,10 +5229,15 @@ msgid "" "answers`. By checking it, attendees will get more points if they answer " "quickly." msgstr "" +"Personalice el :guilabel:`Código de sesión` aquí; los participantes " +"necesitan este código para acceder a la encuesta de la sesión en vivo. " +"Premie a los participantes cuando repondan rápidamente seleccionando la " +"casilla :guilabel:`Premiar respuestas rápidas`. Al seleccionarla, los " +"asistentes obtendrán más puntos si responden rápidamente. " #: ../../content/applications/marketing/surveys/create.rst:193 msgid "Description tab" -msgstr "" +msgstr "Pestaña de descripción" #: ../../content/applications/marketing/surveys/create.rst:195 msgid "" @@ -5094,6 +5246,11 @@ msgid "" "beneath the title on the survey's homepage, which is on the front end of the" " website made through the Odoo :guilabel:`Website` app." msgstr "" +"En la página principal de la plantilla de la encuesta está la pestaña de " +":guilabel:`Descripción`, dónde puede agregar una descripción personalizada " +"de la encuesta. Esto se muestra debajo del título de la página principal de " +"la encuesta, que está en el frontend de la página web que creó a través de " +"la aplicación :guilabel:`Sitio web` de Odoo. " #: ../../content/applications/marketing/surveys/create.rst:200 msgid "Test and share the survey" @@ -5105,6 +5262,10 @@ msgid "" "errors before finally sending it out to the participants by clicking " ":guilabel:`Test` in the upper left corner of the survey template page." msgstr "" +"Una vez que creó y guardó la encuesta, haga una prueba para verificar que no" +" haya errores antes de enviarla a los participantes haciendo clic en el " +"botón :guilabel:`Prueba` que está en la esquina superior izquierda de la " +"página de la plantilla de la encuesta. " #: ../../content/applications/marketing/surveys/create.rst:206 msgid "" @@ -5113,6 +5274,10 @@ msgid "" " participants. Proceed to run through the survey, like a normal participant," " to check for errors." msgstr "" +"Al activar está función, Odoo lo redirecciona a una versión de prueba de la " +"encuesta en el frontend del sitio web. Esta página muestra como lucirá la " +"encuesta para los participantes. Realice la encuesta como lo haría el " +"participante para revisar que no haya errores. " #: ../../content/applications/marketing/surveys/create.rst:210 msgid "" @@ -5122,6 +5287,12 @@ msgid "" " the backend, make any further changes, as needed, before officially sending" " the survey out to participants." msgstr "" +"Para regresar al formulario de la plantilla de la encuesta en el backend, " +"solo haga clic en el enlace que está en el panel azul en la parte superior " +"de la página que dice :guilabel:`Está es una prueba. Editar encuesta`. Una " +"vez que Odoo lo redirecciona a la plantilla de la encuesta en el backend, " +"haga los cambios necesarios antes de enviar oficialmente la encuesta a los " +"participantes. " #: ../../content/applications/marketing/surveys/create.rst:215 msgid "" @@ -5129,6 +5300,10 @@ msgid "" ":guilabel:`Start Survey` button in the upper-left corner of the survey " "template form. Then, click :guilabel:`Share`." msgstr "" +"Cuando esté listo para compartir la encuesta con la audiencia, haga clic en " +"el botón :guilabel:`Iniciar encuesta` que está en el lado superior izquierdo" +" del formulario de la plantilla de la encuesta. Luego haga clic en " +":guilabel:`Compartir`. " #: ../../content/applications/marketing/surveys/create.rst:218 msgid "" @@ -5137,6 +5312,12 @@ msgid "" " the :guilabel:`Additional emails` field (for contacts that do not want to " "be listed in the Odoo database). Finally, click :guilabel:`Send`." msgstr "" +"En la ventana emergente que aparece, en el campo :guilabel:`Destinatarios`, " +"agregue a los destinatarios que recibirán la encuesta (para contactos ya " +"existentes en la base de datos de Odoo). También puede elegir el campo " +":guilabel:`Correos adicionales` (para contactos que no quieran estar " +"registrados en la base de datos de Odoo). Finalmente, haga clic en " +":guilabel:`Enviar`. " #: ../../content/applications/marketing/surveys/create.rst:222 msgid "" @@ -5145,10 +5326,15 @@ msgid "" "button in the upper left corner. To end the survey, click the " ":guilabel:`Close` button on the survey template form." msgstr "" +"Mientras recibe las respuestas, revíselas haciendo clic en el botón " +"inteligente de :guilabel:`Respuestas` en el formulario de la plantilla de la" +" encuesta o en el botón de :guilabel:`Ver resultados` que está en la esquina" +" superior izquierda. Para terminar la encuesta, haga clic en el botón de " +":guilabel:`Cerrar` en el formulario de la plantilla de la encuesta. " #: ../../content/applications/marketing/surveys/scoring.rst:3 msgid "Scoring surveys" -msgstr "" +msgstr "Puntaje de las encuestas" #: ../../content/applications/marketing/surveys/scoring.rst:5 msgid "" @@ -5157,6 +5343,10 @@ msgid "" "survey, these points are summed up, resulting in the participant's final " "score." msgstr "" +"Para tener una métrica del rendimiento, conocimiento y satisfacción general " +"del participante, Odoo asigna puntos a las respuestas de las encuestas. Al " +"final de la encuesta, estos puntos se suman dando como resultado el puntaje " +"final. " #: ../../content/applications/marketing/surveys/scoring.rst:9 msgid "" @@ -5165,6 +5355,11 @@ msgid "" "Under the :guilabel;`Scoring` section, choose between :guilabel:`Scoring " "with answers at the end` or :guilabel:`Scoring without answers at the end`." msgstr "" +"Para agregar puntos a las encuestas, abra la aplicación " +":guilabel:`Encuestas`, seleccione el formulario de encuesta que desee y haga" +" clic en la pestaña de :guilabel:`Opciones`. En la sección " +":guilabel;`Puntaje`, seleccione entre las opciones de :guilabel:`Puntaje con" +" respuestas al final` o :guilabel:`Puntaje sin respuestas al final`. " #: ../../content/applications/marketing/surveys/scoring.rst:14 msgid "" @@ -5173,6 +5368,10 @@ msgid "" " got right or wrong. On questions where there was an incorrect answer, the " "correct answer will be highlighted." msgstr "" +":guilabel:`Puntaje con respuestas al final` le muestra al participante sus " +"respuestas correctas e incorrectas después de haber terminado la encuesta. " +"En las preguntas donde respondió incorrectamente, la respuesta correcta " +"estará resaltada. " #: ../../content/applications/marketing/surveys/scoring.rst:18 msgid "" @@ -5180,6 +5379,9 @@ msgid "" "participant their answer choices after completing the survey, only their " "final score." msgstr "" +":guilabel:`Puntaje sin respuestas al final` no le muestra al participante " +"sus respuestas después de terminar la encuesta, solo aparece su puntaje " +"final. " #: ../../content/applications/marketing/surveys/scoring.rst:21 msgid "" @@ -5188,6 +5390,10 @@ msgid "" "answer` box for the choice that is the correct answer and attach a score " "value." msgstr "" +"Para indicar cuáles son las respuestas correctas, haga clic en la " +":guilabel:`Pestaña de preguntas` y elija una pregunta. En el formulario de " +"preguntas, seleccione la casilla :guilabel:`Respuesta correcta` para la " +"opción correcta y agregue un valor de puntuación. " #: ../../content/applications/marketing/surveys/scoring.rst:25 msgid "" @@ -5195,6 +5401,10 @@ msgid "" ":guilabel:`Success %`. The percentage entered determines what percentage of " "correct answers is needed to pass the survey." msgstr "" +"En la pestaña :guilabel:`Opciones` de la encuesta, establezca el " +":guilabel:`Porcentaje del puntaje obligatorio`. El porcentaje que introduzca" +" determina el porcentaje correcto de respuestas correctas para aprobar la " +"encuesta. " #: ../../content/applications/marketing/surveys/scoring.rst:28 msgid "" @@ -5203,6 +5413,11 @@ msgid "" "indicates that the survey asks questions to test the participants' knowledge" " level on a subject." msgstr "" +"Más adelante en la pestaña de :guilabel:`Opciones` de la encuesta, los " +"administradores de la misma también pueden convertir la encuesta en una " +"certificación. Una certificación indica que la encuesta contiene preguntas " +"que ponen a prueba el nivel de conocimiento del participante sobre un tema." +" " #: ../../content/applications/marketing/surveys/scoring.rst:32 msgid "" @@ -5212,6 +5427,12 @@ msgid "" "survey with a final score that is greater than or equal to the set " ":guilabel:`Success %`." msgstr "" +"Al activar la opción de :guilabel:`Es una certificación`, seleccione " +"también una :guilabel:`Plantilla de correo electrónico de la certificación`." +" Se enviará automáticamente la certificación usando esa plantilla de correo " +"a los usuarios que aprobaron la encuesta con un puntaje final que sea mayor " +"o igual al que estableció en :guilabel:`Porcentaje de puntuación " +"obligatorio`. " #: ../../content/applications/marketing/surveys/scoring.rst:36 msgid "" @@ -5222,12 +5443,21 @@ msgid "" "option to :guilabel:`Give Badge`, located beneath the " ":guilabel:`Certification` options in the :guilabel:`Scoring` section." msgstr "" +"En la sección de :guilabel:`Participantes`, puede pedirle a los " +"participantes que inicien sesión para realizar la encuesta. Si está activada" +" la opción de :guilabel:`Se requiere inicio de sesión`, aparecerán dos " +"nuevas opciones: la casilla de :guilabel:`Límitar intentos`, lo que limíta " +"el número de veces que un participante puede intentar realizar la encuesta, " +"y la opción :guilabel:`Dar insignia`, ubicada debajo de las opciones de " +":guilabel:`Certificación` en la sección de :guilabel:`Puntaje. ` " #: ../../content/applications/marketing/surveys/scoring.rst-1 msgid "" "Setting the Required Score (percentage), login required, and certification " "template." msgstr "" +"Configuración del puntaje requerido (en porcentaje), el inicio de sesión " +"requerido y la plantilla de la certificación. " #: ../../content/applications/marketing/surveys/scoring.rst:46 msgid "" @@ -5236,24 +5466,33 @@ msgid "" "gaining points. Besides the awardee, website visitors who access the " ":guilabel:`Courses` page will also be able to see the granted badges." msgstr "" +"Las insignias se muestran en la sección de eLearning del portal del usuario " +"y son una forma de establecer objetivos y premiar a los participantes por " +"aprobar las encuestas o ganar puntos. Además del participante premiado, los " +"visitantes del sitio web que accedan a la página de :guilabel:`Cursos` " +"también podrán ver las insignias." #: ../../content/applications/marketing/surveys/scoring.rst-1 msgid "Example of how a badge looks on the eLearning portion of the website." msgstr "" +"Ejemplo de cómo se ve una insignia en la sección de eLearning del sitio web." +" " #: ../../content/applications/marketing/surveys/time_random.rst:3 msgid "Timed and randomized questions" -msgstr "" +msgstr "Preguntas cronometradas y aleatorias " #: ../../content/applications/marketing/surveys/time_random.rst:5 msgid "" "When creating a survey in Odoo, there are options to set a time limit on the" " survey and randomize the questions." msgstr "" +"Al crear una encuesta en Odoo, hay opciones que le permiten establecer un " +"tiempo límite en la encuesta y mostrar las preguntas aleatoriamente. " #: ../../content/applications/marketing/surveys/time_random.rst:9 msgid "Time limit" -msgstr "" +msgstr "Tiempo límite" #: ../../content/applications/marketing/surveys/time_random.rst:11 msgid "" @@ -5263,16 +5502,26 @@ msgid "" " external resources (e.g. web search), and reduces the survey to a \"closed " "book\" testing environment." msgstr "" +"Durante una encuesta con tiempo límite, los participantes deben terminarla " +"dentro de un periodo de tiempo establecido. Un caso de uso muy común en el " +"que se usa el tiempo límite es para reducir la propabilidad de que el " +"participante busque las respuestas en otro lado (por ejemplo, en internet), " +"y establce la encuesta como un ambiente de prueba a \"libro cerrado\". " #: ../../content/applications/marketing/surveys/time_random.rst:16 msgid "" "Find the :guilabel:`Survey Time Limit` setting in the :guilabel:`Options` " "tab of the survey form, under the :guilabel:`Questions` section." msgstr "" +"Busque la opción :guilabel:`Tiempo límite de la encuesta` en la pestaña de " +":guilabel:`Opciones` del formulario de la encuesta, en la sección de " +":guilabel:`Preguntas`. " #: ../../content/applications/marketing/surveys/time_random.rst-1 msgid "Time limit field in the options tab of a survey template form." msgstr "" +"El campo de tiempo límite en la pestaña de opciones de una plantilla del " +"formulario de una encuesta. " #: ../../content/applications/marketing/surveys/time_random.rst:23 msgid "" @@ -5280,16 +5529,22 @@ msgid "" "displayed on every page of the survey, letting participants keep track of " "the time remaining while the survey is active." msgstr "" +"Cuando selecciona la opción :guilabel:`Tiempo límite de la encuesta`, " +"aparecerá un cronómetro en cada página de la encuesta, permitiendole a los " +"participantes estar atentos al tiempo restante mientras la encuesta está " +"activa. " #: ../../content/applications/marketing/surveys/time_random.rst:27 msgid "" "Participants that do not submit their survey by the preconfigured time limit" " will *not* have their answers saved." msgstr "" +"A los participantes que no suban su encuesta en el tiempo límite " +"preesablecido *no* se les guardarán sus respuestas. " #: ../../content/applications/marketing/surveys/time_random.rst:31 msgid "Randomized selection" -msgstr "" +msgstr "Aleatorio por sección " #: ../../content/applications/marketing/surveys/time_random.rst:33 msgid "" @@ -5298,6 +5553,11 @@ msgid "" "randomization as a survey method discourages participants from looking at " "each other's responses, and helps control for individual testing." msgstr "" +"Cuando una encuesta es aleatoria, Odoo mezcla las preguntas y las muestra en" +" un orden aleatorio cada vez que un participante comienza a responder las " +"preguntas. Utilizar este método no le permite a los participantes comparar " +"sus respuestas entre ellos y ayuda a darle control para pruebas " +"individuales. " #: ../../content/applications/marketing/surveys/time_random.rst:37 msgid "" @@ -5308,7 +5568,16 @@ msgid "" "count` column. From there, determine how many questions (per section) Odoo " "should select and display during the shuffling of questions." msgstr "" +"Para hacer aleatoria una encuesta, haga clic en la pestaña de " +":guilabel:`Opciones` en el formulario de la encuesta. En la sección de " +":guilabel:`Preguntas`, seleccione :guilabel:`Aleatorio por sección` para el " +"campo de :guilabel:`Selección de preguntas`. Después de activarla, vaya a la" +" pestaña de :guilabel:`Preguntas` y busque la columna :guilabel:`Número de " +"preguntas aleatorias`. A partir de ahí, establezca cuántas preguntas (por " +"sección) debe seleccionar y mostrar Odoo durante la mezcla de preguntas." +" " #: ../../content/applications/marketing/surveys/time_random.rst-1 msgid "Randomized question count in the questions tab of a survey." msgstr "" +"Número de preguntas aleatorias en la pestaña de preguntas de una encuesta. " diff --git a/locale/es/LC_MESSAGES/productivity.po b/locale/es/LC_MESSAGES/productivity.po index 55c9c0ae5..d8ae6cd5f 100644 --- a/locale/es/LC_MESSAGES/productivity.po +++ b/locale/es/LC_MESSAGES/productivity.po @@ -17,6 +17,7 @@ # Aimée Mendoza Sánchez, 2023 # Martin Trigaux, 2023 # Fernanda Alvarez, 2023 +# Iran Villalobos López, 2023 # #, fuzzy msgid "" @@ -25,7 +26,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-06-02 08:43+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7060,6 +7061,8 @@ msgid "" "With Studio, you can edit existing PDF reports (e.g., orders and quotations)" " or create new ones." msgstr "" +"Con Studio, puede editar reportes en PDF existentes (por ejemplo, órdenes y " +"cotizaciones) o crear nuevos. " #: ../../content/applications/productivity/studio/pdf_reports.rst:8 msgid "" @@ -7070,14 +7073,21 @@ msgid "" "right corner of the report, click the vertical ellipsis icon " "(:guilabel:`⋮`), and then select :guilabel:`Duplicate`." msgstr "" +"Para editar un reporte PDF estándar, le recomendamos enfáticamente " +"**duplicarlo** y hacer los cambios en la versión duplicada, puesto que los " +"cambios hechos a los reportes estándar se sobreescriben después de una " +"actualización de Odoo. Para duplicar un reporte, vaya a " +":menuselection:`Studio --> Reportes`. Coloque el cursor en la esquina " +"superior derecha del reporte, haga clic en el ícono de la elipsis vertical " +"(:guilabel:`⋮`), y seleccione :guilabel:`Duplicar`. " #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Duplicating a PDF report" -msgstr "" +msgstr "Duplicacón de un reporte PDF" #: ../../content/applications/productivity/studio/pdf_reports.rst:20 msgid "Default layout" -msgstr "" +msgstr "Diseño predeterminado " #: ../../content/applications/productivity/studio/pdf_reports.rst:22 msgid "" @@ -7086,12 +7096,18 @@ msgid "" "Document Layout`. Layout settings apply to all reports but only to the " "current company." msgstr "" +"El diseño predeterminado de los reportes se maneja fuera de Studio. Vaya a " +":menuselection:`Ajustes --> Empresas: Diseño del documento --> Configruación" +" del diseño del documento`. Los ajustes del diseño aplican a todos los " +"reportes pero solo de la empresa actual. " #: ../../content/applications/productivity/studio/pdf_reports.rst:27 msgid "" "Use :guilabel:`Download PDF Preview` to view how the different settings " "affect the layout of a sample invoice." msgstr "" +"Use :guilabel:`Descargar la vista previa del PDF` para ver como los " +"diferentes ajustes pueden alterar el diseño de una simple factura. " #: ../../content/applications/productivity/studio/pdf_reports.rst:33 msgid "Layout" @@ -7099,7 +7115,7 @@ msgstr "Diseño" #: ../../content/applications/productivity/studio/pdf_reports.rst:35 msgid "Four layouts are available." -msgstr "" +msgstr "Hay cuatro diseños disponibles. " #: ../../content/applications/productivity/studio/pdf_reports.rst:39 msgid "Light" @@ -7107,31 +7123,31 @@ msgstr "Light" #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Light report layout sample" -msgstr "" +msgstr "Ejemplo del diseño de reporte Light" #: ../../content/applications/productivity/studio/pdf_reports.rst:44 msgid "Boxed" -msgstr "Archivado" +msgstr "Con tabla " #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Boxed report layout sample" -msgstr "" +msgstr "Ejemplo del diseño de reporte Con tabla " #: ../../content/applications/productivity/studio/pdf_reports.rst:49 msgid "Bold" -msgstr "Negrita" +msgstr "Negritas " #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Bold report layout sample" -msgstr "" +msgstr "Ejemplo del diseño del reporte en Negritas" #: ../../content/applications/productivity/studio/pdf_reports.rst:54 msgid "Striped" -msgstr "Listado" +msgstr "Subrayado" #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Striped report layout sample" -msgstr "" +msgstr "Ejemplo del diseño de reporte Subrayado" #: ../../content/applications/productivity/studio/pdf_reports.rst:62 msgid "Font" @@ -7142,47 +7158,53 @@ msgid "" "Seven fonts are available. Click on the links below to preview them on " "`Google Fonts `_." msgstr "" +"Están disponibles siete tipos de letra. Haga clic en los enlaces a " +"continuación para obtener una vista previa en `Google Fonts " +"`_. " #: ../../content/applications/productivity/studio/pdf_reports.rst:67 msgid "`Lato `_" -msgstr "" +msgstr "`Lato `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:68 msgid "`Roboto `_" -msgstr "" +msgstr "`Roboto `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:69 msgid "`Open Sans `_" msgstr "" +"`Open Sans `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:70 msgid "" "`Montserrat `_" msgstr "" +"`Montserrat `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:71 msgid "`Oswald `_" -msgstr "" +msgstr "`Oswald `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:72 msgid "`Raleway `_" -msgstr "" +msgstr "`Raleway `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:73 msgid "`Tajawal `_" -msgstr "" +msgstr "`Tajawal `_" #: ../../content/applications/productivity/studio/pdf_reports.rst:76 msgid ":guilabel:`Tajawal` supports both Arabic and Latin scripts." -msgstr "" +msgstr ":guilabel:`Tajawal` supports both Arabic and Latin scripts." #: ../../content/applications/productivity/studio/pdf_reports.rst:81 msgid "Company logo" -msgstr "" +msgstr "Logo de la empresa " #: ../../content/applications/productivity/studio/pdf_reports.rst:83 msgid "Upload an image file to add a :guilabel:`Company Logo`." msgstr "" +"Suba un archivo de imagen para agregar un :guilabel:`Logo de la empresa`. " #: ../../content/applications/productivity/studio/pdf_reports.rst:86 msgid "" @@ -7190,6 +7212,9 @@ msgid "" " can access by going to :menuselection:`General Settings --> Companies --> " "Update Info`." msgstr "" +"Esto agrega el logo al registro de la empresa en el modelo *Empresa*, al que" +" puede acceder si va a :menuselection:`Ajustes generales --> Empresas --> " +"Actualizar información`." #: ../../content/applications/productivity/studio/pdf_reports.rst:92 msgid "Colors" @@ -7201,32 +7226,39 @@ msgid "" " important elements. The default colors are automatically generated based on" " the colors of the logo." msgstr "" +"Cambie los colores primarios y secundarios que usa en los reportes para " +"resaltar elementos importantes. Los colores predeterminados se generan " +"automáticamente con base en los colores del logo. " #: ../../content/applications/productivity/studio/pdf_reports.rst:100 msgid "Layout background" -msgstr "" +msgstr "Diseño del fondo " #: ../../content/applications/productivity/studio/pdf_reports.rst:102 msgid "Change the :guilabel:`Layout Background` of the report:" -msgstr "" +msgstr "Cambie el :guilabel:`Diseño del fondo` del reporte: " #: ../../content/applications/productivity/studio/pdf_reports.rst:104 msgid ":guilabel:`Blank`: nothing is displayed." -msgstr "" +msgstr ":guilabel:`En blanco`: no se muestra nada." #: ../../content/applications/productivity/studio/pdf_reports.rst:105 msgid "" ":guilabel:`Geometric`: an image featuring geometric shapes is displayed in " "the background." msgstr "" +":guilabel:`Geometrico`: se muestra una imagen con figuras geométricas de " +"fondo. " #: ../../content/applications/productivity/studio/pdf_reports.rst:106 msgid ":guilabel:`Custom`: use a custom background image by uploading one." msgstr "" +":guilabel:`Personalizado`: suba una imagen personalizada para usarla de " +"fondo." #: ../../content/applications/productivity/studio/pdf_reports.rst:111 msgid "Company tagline" -msgstr "" +msgstr "Lema de la empresa" #: ../../content/applications/productivity/studio/pdf_reports.rst:113 msgid "" @@ -7234,10 +7266,13 @@ msgid "" " reports `. You can add multiple " "lines of text." msgstr "" +"El :guilabel:`Lema de la empresa` se muestra en el encabezado de " +":ref:`Reportes externos `. Puede " +"agregar varias líneas de texto. " #: ../../content/applications/productivity/studio/pdf_reports.rst:119 msgid "Company details" -msgstr "" +msgstr "Detalles de la empresa " #: ../../content/applications/productivity/studio/pdf_reports.rst:121 msgid "" @@ -7245,6 +7280,9 @@ msgid "" ":ref:`External reports `. You can" " add multiple lines of text." msgstr "" +"Los :guilabel:`Detalles de la empresa` se muestran en el encabezado de " +":ref:`Reportes externos `. Puede " +"agregar varias líneas de texto. " #: ../../content/applications/productivity/studio/pdf_reports.rst:127 msgid "Footer" @@ -7256,6 +7294,9 @@ msgid "" "reports' ` footers. You can add " "multiple lines of text." msgstr "" +"Use el campo :guilabel:`Pie de página` para poner texto en el pie de página " +"de los :ref:`Reportes externos' `. Puede agrergar varias líneas de texto. " #: ../../content/applications/productivity/studio/pdf_reports.rst:135 msgid "Paper format" @@ -7267,6 +7308,9 @@ msgid "" "You can either select :guilabel:`A4` (21 cm x 29.7 cm) or :guilabel:`US " "Letter` (21.59 cm x 27.54 cm)." msgstr "" +"Use el campo de :guilabel:`Formato de papel` para cambiar el tamaño del " +"papel de los repórtes. Puede seleccionar :guilabel:`A4` (21 cm x 29.7 cm) o " +":guilabel:`Carta US` (21.59 cm x 27.54 cm)." #: ../../content/applications/productivity/studio/pdf_reports.rst:141 msgid "" @@ -7274,14 +7318,20 @@ msgid "" "app containing the report, then go to :menuselection:`Studio --> Reports -->" " Select or Create a report --> Report --> Select a Paper format`." msgstr "" +"Puede cambiar el :guilabel:`Formato del papel` en los reportes individuales." +" Abra la aplicación que contiene el reporte, luego vaya a " +":menuselection:`Studio --> Reportes --> Seleccione o cree un reporte --> " +"Reporte --> Seleccione un formato de papel`. " #: ../../content/applications/productivity/studio/pdf_reports.rst-1 msgid "Configuration pop-up window for the default layout of PDF reports" msgstr "" +"Ventana emergente de configuración para el diseño predeterminado de los " +"reportes en PDF" #: ../../content/applications/productivity/studio/pdf_reports.rst:151 msgid "Header and footer" -msgstr "" +msgstr "Encabezado y pie de página " #: ../../content/applications/productivity/studio/pdf_reports.rst:153 msgid "" @@ -7293,6 +7343,13 @@ msgid "" "reports/header-footer/internal`, or :ref:`studio/pdf-reports/header-" "footer/blank`." msgstr "" +"Al crear un reporte nuevo en Studio, primero debe elegir uno de entre tres " +"estilos de reporte. Esto se usa para determinar qué encabezado y pie de " +"página se mostrará. Para hacerlo, vaya a la aplicación en dónde quiere " +"agregar un nuevo reporte, luego al :menuselection:`Botón de Studio --> " +"Reportes --> Crear` y seleccione :ref:`studio/pdf-reports/header-" +"footer/external`, :ref:`studio/pdf-reports/header-footer/internal` o " +":ref:`studio/pdf-reports/header-footer/blank`. " #: ../../content/applications/productivity/studio/pdf_reports.rst:162 msgid "External" @@ -7305,12 +7362,18 @@ msgid "" ":guilabel:`Company Name`, :guilabel:`Phone`, :guilabel:`Email`, and " ":guilabel:`Website`." msgstr "" +"El encabezado muestra el :ref:`studio/pdf-reports/default-layout/logo` y " +"varios valores establecidos en el modelo *Empresa*: el :guilabel:`Nombre de " +"la empresa`, :guilabel:`Teléfono`, :guilabel:`Corre electrónico` y " +":guilabel:`Sitio web`. " #: ../../content/applications/productivity/studio/pdf_reports.rst:169 msgid "" "To change a company's information, go to :menuselection:`Settings --> " "Companies --> Update Info`." msgstr "" +"Para cambiar la información de la empresa, vaya a :menuselection:`Ajustes " +"--> Empresas --> Actualizar información`. " #: ../../content/applications/productivity/studio/pdf_reports.rst-1 msgid "Example of an External header" @@ -7566,22 +7629,31 @@ msgid "" ":guilabel:`Name`: change the report name. The new name is applied everywhere" " (in Studio, under the :guilabel:`Print` button, and for the PDF file name)." msgstr "" +":guilabel:`Nombre`: cambie el nombre del reporte. El nuevo nombre se cambia " +"en todos lados (en Studio, en el botón :guilabel:`Imprimir` y para el nombre" +" del archivo PDF). " #: ../../content/applications/productivity/studio/pdf_reports.rst:297 msgid ":guilabel:`Paper format`: change the paper size of the report." msgstr "" +":guilabel:`Formato del papel`: cambie el tamaño del papel del reporte." #: ../../content/applications/productivity/studio/pdf_reports.rst:299 msgid "" ":guilabel:`Add in print`: add the report under the :guilabel:`🖶 Print` " "button available on the record." msgstr "" +":guilabel:`Agergar para imprimir`: agregue el reporte en el botón " +":guilabel:`🖶 Imprimir` qie está disponible en el registro. " #: ../../content/applications/productivity/studio/pdf_reports.rst:302 msgid "" ":guilabel:`Limit visibility to groups`: limit the availability of the PDF " "report to specific :doc:`user groups <../../general/users/access_rights>`." msgstr "" +":guilabel:`Visibilidad limitada a los grupos`: limíte la disponibilidad del " +"reporte en PDF a :doc:`grupos de usuarios user groups " +"<../../general/users/access_rights>` específicos. " #: ../../content/applications/productivity/studio/pdf_reports.rst:306 msgid "Options tab" @@ -7607,34 +7679,42 @@ msgstr "" #: ../../content/applications/productivity/studio/pdf_reports.rst:317 msgid "Below are presented some of the most common options:" -msgstr "" +msgstr "A continuación están algunas de las opciones más comunes: " #: ../../content/applications/productivity/studio/pdf_reports.rst:319 msgid "" ":guilabel:`Margins`: add spacing at the :guilabel:`top`, :guilabel:`right`, " ":guilabel:`bottom`, and :guilabel:`left` of the element." msgstr "" +":guilabel:`Márgenes`: agaregue un espaciado en la parte " +":guilabel:`superior`, :guilabel:`derecha`, :guilabel:`inferior`, e " +":guilabel:`izquierda` del elemento. " #: ../../content/applications/productivity/studio/pdf_reports.rst:322 msgid ":guilabel:`Width`: set the element's maximum width." -msgstr "" +msgstr ":guilabel:`Ancho`: establezca el ancho máximo del elemento. " #: ../../content/applications/productivity/studio/pdf_reports.rst:324 msgid "" ":guilabel:`Visible if`: set under which condition(s) the element should be " "displayed." msgstr "" +":guilabel:`Visible si`: establezca bajo que condición(es) se debe mostrar el" +" elemento. " #: ../../content/applications/productivity/studio/pdf_reports.rst:326 msgid "" ":guilabel:`Visible for`: set for which :doc:`users groups " "<../../general/users/access_rights>` the element should be displayed." msgstr "" +":guilabel:`Visible para`: establezca para qué :doc:`grupos de usuarios " +"<../../general/users/access_rights>` se debe mostrar el elemento. " #: ../../content/applications/productivity/studio/pdf_reports.rst:329 msgid "" ":guilabel:`Remove from View`: remove the element from the report's view." msgstr "" +":guilabel:`Quitar de la vista`: quitar el elemento de la vista del reporte." #: ../../content/applications/productivity/studio/pdf_reports.rst:331 msgid ":guilabel:`Text decoration`: bold, italicize, and underline the font." @@ -7647,14 +7727,19 @@ msgid "" ":guilabel:`Alignment`: align the element to the left, center, or right of " "the report." msgstr "" +":guilabel:`Alineación`: alinee el elemento a la izquierda, al centro o a la " +"derecha del reporte. " #: ../../content/applications/productivity/studio/pdf_reports.rst:335 msgid ":guilabel:`Font style`: use one of the default font styles." msgstr "" +":guilabel:`Estilo de fuente`: use uno de los estilos de fuente predefinidos." +" " #: ../../content/applications/productivity/studio/pdf_reports.rst:337 msgid ":guilabel:`Colors`: change the font's color and the background color." msgstr "" +":guilabel:`Colores`: cambie el color de la fuente y el color del fondo." #: ../../content/applications/productivity/studio/pdf_reports.rst:340 msgid "" diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po index de8625307..52c9fe8e7 100644 --- a/locale/es/LC_MESSAGES/sales.po +++ b/locale/es/LC_MESSAGES/sales.po @@ -20,18 +20,18 @@ # Pedro M. Baeza , 2023 # Braulio D. López Vázquez , 2023 # Aimée Mendoza Sánchez, 2023 -# Martin Trigaux, 2023 # Iran Villalobos López, 2023 # Fernanda Alvarez, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,6 +101,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1826,8 +1827,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users ` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1836,9 +1838,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1865,44 +1867,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "Registrar clientes" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"`, automatically apply the :doc:`attributed " +"pricelist `, or :ref:`generate and print " +"an invoice `." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "Desde la interfaz de su sesión, use el botón de cliente." - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "Cree uno nuevo usando este botón." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" -"Se le invitará a completar el formulario del cliente con su información." - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" -"Utilice el botón Guardar cuando haya terminado. Ahora podrá seleccionar ese " -"cliente en cualquier transacción futura." - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session `. For instance, to provide cleaning " @@ -1910,14 +1899,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO ` " "are displayed identically in the cart." @@ -1928,7 +1917,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1939,37 +1928,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "Regresar y reembolsar productos" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1979,13 +1968,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1993,27 +1982,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -2027,31 +2016,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2615,117 +2604,111 @@ msgid ":doc:`epos_ssc`" msgstr ":doc:`epos_ssc`" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" -msgstr "Iniciar sesión como empleado" +msgid "Multi-employee management" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS ` and :ref:`keep" +" track of the employees involved in each order `." msgstr "" -"Con el *Punto de venta* de Odoo puede gestionar múltiples cajeros. Esta " -"función le permite llevar el seguimiento de quién está trabajando y cuándo, " -"así como de cuánto ganó cada cajero en esa sesión." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings ` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -"Hay tres formas de cambiar cajeros en Odoo: al *seleccionar el cajero*, al " -"*ingresar un código NIP* o al *escanear un código de barras*." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge ` or selecting their name from the list of " +"allowed employees to :ref:`open the session `." msgstr "" -"Necesita varios empleados (por lo menos dos) para gestionar múltiples " -"cajeros." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" -msgstr "Configurar el inicio de sesión con Empleados" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session `, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -"Para habilitar esta función, vaya a sus *ajustes de PdV* y seleccione la " -"opción de \"Iniciar sesión con Empleados\" en el *formulario de PdV*. " -"Posteriormente, agregue los empleados que tendrán acceso a la caja " -"registradora." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." -msgstr "Ahora puede cambiar de cajero con facilidad." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "Cambiar sin códigos NIP" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -"La forma más fácil de cambiar cajeros es sin un código. Para hacer esto, " -"haga clic en el nombre del cajero en su interfaz de PdV." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." -msgstr "Ahora solo debe hacer clic en su nombre." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "Cambiar cajeros con códigos NIP" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" -"Puede establecer un código NIP en cada cajero. Para configurar un código " -"NIP, vaya al formulario del empleado y agregue un NIP de seguridad en la " -"*pestaña de ajustes de RR. HH.*." #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "Ahora se solicitará una contraseña NIP al cambiar de cajero." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "Cambiar cajeros con códigos de barras" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -"También puede pedirle a sus empleados que inicien sesión ellos mismos con " -"sus identificaciones. Para hacer esto, configure un código de barras en el " -"mismo lugar en el que agregó el código NIP. Imprima la identificación y " -"cuando la escaneen, el cajero se cambiará a ese empleado." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "Encontrar quién fue el cajero" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -"Una vez que haya cerrado su *sesión de PdV* puede obtener un resumen de la " -"cantidad vendida por cada cajero. Para hacer esto, vaya al menú de órdenes." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analítica" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" -"Ahora puede abrir la orden y obtener un resumen de los productos vendidos." #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 msgid "Payment methods" @@ -4461,11 +4444,11 @@ msgstr "" "referencia y haga clic en :guilabel:`número de recibo`, :guilabel:`fecha` o" " :guilabel:`cliente`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Facturas" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." @@ -4474,11 +4457,11 @@ msgstr "" "momento del pago en la caja registradora o recuperar todas las órdenes " "facturadas pasadas." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "Establecer un cliente" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -4494,7 +4477,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "Selección de clientes y botón de creación" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -4507,7 +4490,7 @@ msgstr "" "del cliente. Haga clic en :guilabel:`guardar` para validar y establecer este" " nuevo cliente." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." @@ -4515,7 +4498,7 @@ msgstr "" "También puede **editar** la información de un cliente al hacer clic en " ":guilabel:`detalles`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." @@ -4523,11 +4506,11 @@ msgstr "" "Si no estableció un cliente durante la orden, puede hacerlo en la pantalla " "de pago al hacer clic en :guilabel:`cliente`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "Facturar a un cliente" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -4542,7 +4525,7 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "Botón para generar una factura en PdV" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." @@ -4551,17 +4534,17 @@ msgstr "" "**factura** se emite de forma automática y se puede descargar o imprimir de " "inmediato." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "Obtener facturas" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" "Siga los siguientes pasos para obtener las facturas desde el **tablero de " "PdV**:" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" @@ -4569,7 +4552,7 @@ msgstr "" "Acceda a todas las ordenes realizadas en su PdV en :menuselection:`Punto de" " venta --> Órdenes --> Órdenes`;" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -4581,7 +4564,7 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "Botón inteligente de factura en el formulario de una orden" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." @@ -4589,7 +4572,7 @@ msgstr "" "Puede identificar las **órdenes facturadas** porque la columna " ":guilabel:`estado` indica que su estado es :guilabel:`facturada`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." @@ -4597,11 +4580,11 @@ msgstr "" "Puede filtrar la lista de órdenes por facturar al hacer clic en " ":guilabel:`filtros` y :guilabel:`facturada`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "Códigos QR para generar facturas" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -4621,7 +4604,7 @@ msgstr "" msgid "order status change" msgstr "Cambio en el estado de la orden" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -5453,13 +5436,10 @@ msgstr "Registrar empleados" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access ` to the POS and :ref:`use " -"barcodes to log your employees in ` your POS." +":ref:`restrict access ` to the POS and " +":ref:`use barcodes to log your employees in ` your " +"POS." msgstr "" -"También puede utilizar un lector de códigos de barras para registrar a sus " -"empleados. Para hacerlo, :ref:`restrinja el acceso ` " -"al PdV y :ref:`utilice los códigos de barras para que sus empleados inicien " -"sesión ` en su PdV." #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 msgid "Sales orders" diff --git a/locale/es/LC_MESSAGES/services.po b/locale/es/LC_MESSAGES/services.po index dcf1d8770..ee700f3f9 100644 --- a/locale/es/LC_MESSAGES/services.po +++ b/locale/es/LC_MESSAGES/services.po @@ -12,8 +12,8 @@ # Martin Trigaux, 2023 # Braulio D. López Vázquez , 2023 # Aimée Mendoza Sánchez, 2023 -# Iran Villalobos López, 2023 # Fernanda Alvarez, 2023 +# Iran Villalobos López, 2023 # #, fuzzy msgid "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-06-02 08:43+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Iran Villalobos López, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3772,6 +3772,9 @@ msgid "" "assign activities to coworkers, and keep track of each project's " "profitability." msgstr "" +"Proyecto de Odoo es una herramienta para gestionar sus proyectos activos. " +"Planifique tareas, asigne actividades a sus compañeros de trabajo y " +"mantengase al tanto del rendimiento de cada proyecto. " #: ../../content/applications/services/project.rst:14 #: ../../content/applications/services/timesheets.rst:11 @@ -3784,7 +3787,7 @@ msgstr "" #: ../../content/applications/services/project/project_management.rst:3 msgid "Project management" -msgstr "" +msgstr "Gestión de proyectos " #: ../../content/applications/services/project/project_management.rst:5 msgid "" @@ -3792,22 +3795,29 @@ msgid "" "projects are broken down into tasks, which are categorized on a whiteboard " "according to what production phase they are in." msgstr "" +"Proyecto de Odoo usa el sistema de gestión de proyectos **Kanban**. Esto " +"significa que todos los proyectos se desglosan en tareas que se categorizan " +"en un tablero de acuerdo a la fase de produción en la que se encuentren. " #: ../../content/applications/services/project/project_management.rst:8 msgid "Did you know?" -msgstr "" +msgstr "¿Sabía que? " #: ../../content/applications/services/project/project_management.rst:10 msgid "" "The word **Kanban** comes from Japanese and refers to the \"visual board\" " "management method." msgstr "" +"La palabra **Kanban** viene del japonés y se refiere al método de gestión " +"\"tablero visual\". " #: ../../content/applications/services/project/project_management.rst:13 msgid "" "`Odoo Tutorials: Kanban Project Management " "`_" msgstr "" +"`Tutoriales de Odoo: Gestión de proyectos Kanban " +"`_" #: ../../content/applications/services/project/project_management.rst:19 msgid "" @@ -3815,20 +3825,26 @@ msgid "" "project. Enter a :guilabel:`Name` for your project and click " ":guilabel:`Create Project`." msgstr "" +"Abra la aplicación **Proyecto** y haga clic en :guilabel:`Crear` para " +"comenzar un nuevo proyecto. Introduzca un :guilabel:`Nombre` para su " +"proyecto y haga clic en :guilabel:`Crear proyecto`. " #: ../../content/applications/services/project/project_management.rst:22 msgid "" "You can customize your existing **projects** from the dashboard by clicking " "the drop-down toggle button (:guilabel:`⋮`) on your project's **card**." msgstr "" +"Puede personalizar sus **proyectos** desde el tablero haciendo clic en el " +"botón desplegable de alternar (:guilabel:`⋮`) en la **tarjeta** de su " +"proyecto." #: ../../content/applications/services/project/project_management.rst-1 msgid "Project card" -msgstr "" +msgstr "Tarjeta del proyecto " #: ../../content/applications/services/project/project_management.rst:29 msgid "This enables a new menu divided into four parts:" -msgstr "" +msgstr "Esto activa un nuevo menú que se divide en cuatro partes:" #: ../../content/applications/services/project/project_management.rst:31 msgid "" @@ -3838,64 +3854,78 @@ msgid "" "such as :guilabel:`Documents`. All uploaded files can be found under this " "menu, as well as in the **Documents** app, under :guilabel:`Projects`;" msgstr "" +":guilabel:`Vista`: vea un resumen de los componentes de su proyecto tales " +"como sus :guilabel:`Tareas`, :guilabel:`Objetivos` y las " +":guilabel:`Actualizaciones del proyecto`. Dependiendo de las aplicaciones " +"que tenga activadas, tendrá más opciones disponibles, como " +":guilabel:`Documentos`. Puede encontrar todos los archivos subidos en este " +"menú, aspi como en la aplicación **Documentos**, en :guilabel:`Proyectos`;" #: ../../content/applications/services/project/project_management.rst:35 msgid "" ":guilabel:`Reporting`: analyze your project's progress and profitability " "through graphics and statistics;" msgstr "" +":guilabel:`Reportes`: analice el progreso y rendimiento de su proyecto con " +"gráficos y estadísticas;" #: ../../content/applications/services/project/project_management.rst:37 msgid "" "**Color**: make a line of color appear on the left side of the card so that " "your project is more recognizable;" msgstr "" +"**Color**: ponga una línea de color del lado izquierdo de la tarjeta para " +"reconocer fácilmente su proyecto;" #: ../../content/applications/services/project/project_management.rst:39 msgid ":guilabel:`Settings`: you can change the following:" -msgstr "" +msgstr ":guilabel:`Ajustes`: puede cambiar lo siguiente:" #: ../../content/applications/services/project/project_management.rst:41 msgid "the :guilabel:`Name` of the project;" -msgstr "" +msgstr "el :guilabel:`Nombre` del proyecto;" #: ../../content/applications/services/project/project_management.rst:42 msgid "the :guilabel:`Name of the tasks` found under that project;" msgstr "" +"el :guilabel:`Nombre de las tareas` que le pertenecen a ese proyecto; " #: ../../content/applications/services/project/project_management.rst:43 msgid "the :guilabel:`Customer` for whom the project is intended;" -msgstr "" +msgstr "el :guilabel:`Cliente` para quién es el proyecto; " #: ../../content/applications/services/project/project_management.rst:44 msgid "the :guilabel:`Tags` used for filtering;" -msgstr "" +msgstr "las :guilabel:`Etiquetas` que usa para los filtros;" #: ../../content/applications/services/project/project_management.rst:45 msgid "the :guilabel:`Company` responsible for the project;" -msgstr "" +msgstr "la :guilabel:`Empresa` responsable del proyecto;" #: ../../content/applications/services/project/project_management.rst:46 msgid "the employee designated as :guilabel:`Project Manager`;" -msgstr "" +msgstr "el empleado asignado como :guilabel:`Gerente del proyecto`;" #: ../../content/applications/services/project/project_management.rst:47 msgid "the :guilabel:`Planned Date` of the project;" -msgstr "" +msgstr "la :guilabel:`Fecha planeada` del proyecto;" #: ../../content/applications/services/project/project_management.rst:48 msgid "the total :guilabel:`Allocated Hours` for that project." -msgstr "" +msgstr "las :guilabel:`Horas asignadas` totales para ese proyecto." #: ../../content/applications/services/project/project_management.rst:50 msgid "" "Additionally, you can mark the project as :guilabel:`Favorite`, allowing you" " to find it using the :guilabel:`My Favorites` filter on the Kanban view;" msgstr "" +"Además, puede marcar el proyecto como :guilabel:`Favorito`, permitiendole " +"encontrarlo usando el filtro :guilabel:`Mis favoritos` en la vista Kanban;" +" " #: ../../content/applications/services/project/project_management.rst-1 msgid "Project settings" -msgstr "" +msgstr "Ajustes del proyecto" #: ../../content/applications/services/project/project_management.rst:58 msgid "" @@ -3903,16 +3933,21 @@ msgid "" "`_" msgstr "" +"`Ttoriales de Odoo: Personalice su proyecto " +"`_" #: ../../content/applications/services/project/project_management.rst:61 msgid "" "Further settings are available under the :guilabel:`Settings` tab. Most of " "them are *only* available depending on the activated apps." msgstr "" +"Más ajustes están disponibles en la pestaña :guilabel:`Ajustes`. La mayoría " +"están *solo* disponibles dependiendo de las aplicaciones activadas. " #: ../../content/applications/services/project/project_management.rst:65 msgid "Scheduling activities" -msgstr "" +msgstr "Planificar actividades" #: ../../content/applications/services/project/project_management.rst:67 msgid "" @@ -3925,12 +3960,23 @@ msgid "" "According to the :guilabel:`Activity Type`, you may have **additional " "options** available." msgstr "" +"Puede planificar **actividades** por proyecto (por ejemplo, " +":guilabel:`Llamada`, :guilabel:`Reunión`, etc.) haciendo clic en el ícono de" +" **reloj** en un proyecto. Aparecerá una lista con actividades ya planeadas " +"y le permitirá planear actividades **nuevas** haciendo clic en :guilabel:`+ " +"Planificar una actividad`. En la ventana emergente, seleccione el " +":guilabel:`Tipo de actividad`, escriba un :guilabel:`Resumen` para esa " +"actividad, una :guilabel:`Fecha límite`, y asignela a un empleado. De " +"acuerdo con el :guilabel:`Tipo de actividad`, puede tener disponibles " +"**opciones adicionales**." #: ../../content/applications/services/project/project_management.rst:75 msgid "" "If an activity is **already** scheduled, the icon may change to a **phone**," " **group of people**, or other." msgstr "" +"Si una actividad **ya** está planeada, el ícono puede cambiar a un " +"**teléfono**, un **grupo de personas** u otro. " #: ../../content/applications/services/project/tasks.rst:5 msgid "Tasks" diff --git a/locale/es/LC_MESSAGES/websites.po b/locale/es/LC_MESSAGES/websites.po index 3fed15f75..cb27617d5 100644 --- a/locale/es/LC_MESSAGES/websites.po +++ b/locale/es/LC_MESSAGES/websites.po @@ -5,7 +5,6 @@ # # Translators: # Francisco de la Peña , 2022 -# Pablo Rojas , 2022 # Marian Cuadra, 2022 # Nicolás Broggi , 2022 # Patricia Gutiérrez Capetillo , 2022 @@ -16,20 +15,20 @@ # marcescu, 2023 # Leonardo J. Caballero G. , 2023 # Lucia Pacheco, 2023 -# Martin Trigaux, 2023 # Braulio D. López Vázquez , 2023 # Aimée Mendoza Sánchez, 2023 -# Iran Villalobos López, 2023 # Fernanda Alvarez, 2023 +# Iran Villalobos López, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Fernanda Alvarez, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -508,7 +507,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -707,7 +706,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "Cuentas de cliente" @@ -1203,6 +1202,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analítica" @@ -1239,7 +1239,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Productos" @@ -1897,11 +1896,11 @@ msgid "" msgstr "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "Configuración de precios: listas de precios" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1921,12 +1920,12 @@ msgstr "" " precios personalizadas, Odoo utiliza la **lista de precios pública** " "predeterminada para todos los sitios web." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1939,15 +1938,15 @@ msgstr "" "--> Ajustes` y baje a la sección :guilabel:`Tienda - Productos`. Ahí tendrá " "dos opciones:" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr ":guilabel:`Múltiples precios por producto`;" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr ":guilabel:`Reglas de precios avanzadas (descuentos, fórmulas)`." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1959,11 +1958,11 @@ msgstr "" "regulares, etc. La **segunda** opción le permite establecer regls de *cambio" " de precio*, como **descuentos**, **márgenes**, **redondeos**, etc." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "Divisa extranjera" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1979,15 +1978,15 @@ msgstr "" msgid "Pricelists selection" msgstr "Selección de listas de precios" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "Descuento permanente" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -2003,7 +2002,7 @@ msgstr "" msgid "Price strikethrough" msgstr "Tachado de precio" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -3446,570 +3445,287 @@ msgstr "" msgid "Multiple websites" msgstr "Múltiples sitios web" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -"Los sitios web múltiples de Odoo ofrecen amplias posibilidades de " -"diversificación y segmentación de clientes para su empresa. Conseguir una " -"mayor audiencia y aumentar sus ingresos nunca fue tan fácil." -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name `, theme, pages, " +"menus, :doc:`languages `, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages `." msgstr "" -"Cada sitio web puede funcionar de forma totalmente independiente, con su " -"propio tema, marca, nombre de dominio, encabezado, pie de página, páginas, " -"idiomas, productos, entradas de blog, foro, diapositivas, eventos, canales " -"de chat en vivo, etc. ¡Empecemos!" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Configuración" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -"Si desea crear un nuevo sitio web, vaya a :menuselection:`Sitio web --> " -"Configuración --> Ajustes`. Encontrará el botón *Crear un nuevo sitio web* " -"en la primera sección." -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "" +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -"En el siguiente campo, establezca un nombre para su nuevo sitio web y un " -"nombre específico de dominio, déjelo vacío para publicar su nuevo sitio web " -"bajo el dominio predeterminado de su base de datos de Odoo. Más adelante " -"podrá establecer algunos grupos de países para redirigir a los visitantes " -"mediante GeoIP." #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -"Lo siguiente será seleccionar un tema. Este nuevo sitio web puede tener un " -"propósito o audiencia totalmente diferente al primero, por lo que puede usar" -" otro tipo de tema." -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 -msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 +msgid "" +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -"Una vez que seleccione un tema, podrá crear la página principal de su sitio " -"web. Preste atención a los indicadores morados, le servirán como guía al " -"empezar." #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -"Si utiliza Odoo en línea, no olvide redirigir cualquier nombre de dominio " -"nuevo a su base de datos de Odoo (``CNAME``) y autorizarlo desde Odoo. " -"Consulte :ref:`domain-name/existing`." -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" -msgstr "Crear menú" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -"El nuevo sitio web tiene un menú predeterminado con todas las aplicaciones " -"instaladas. Para editarlo, haga clic en :menuselection:`Páginas --> Editar " -"menú`. A partir de ahora solo se editará el menú de la página web actual." -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "Cambiar de un sitio web a otro" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -"¡Es tan fácil como contar a tres! El menú para cambiar de sitio web se " -"encuentra en la esquina superior derecha. Al acceder a otro sitio web se " -"conectará con el dominio del mismo. Si utiliza otro dominio, se le pedirá al" -" usuario que inicie sesión." -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -"Cuando haga el cambio, se le redirigirá a la misma ruta de dominio que en el" -" otro sitio web (por ejemplo, ``/shop/myproduct``). Si no se utiliza esta " -"URL, se le redirigirá a una página 404, pero se le pedirá que cree una nueva" -" página desde ahí." -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Agregar funciones" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -"Las aplicaciones web que decida instalar (por ejemplo, Diapositivas o Blogs)" -" estarán disponibles en todos sus sitios web. También puede ocultarlas en un" -" sitio web, solo debe eliminar el elemento del menú." -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -"Cada sitio web cuenta con una gran variedad de opciones específicas en la " -"configuración. Primero, seleccione el sitio web que desea configurar." -#: ../../content/applications/websites/website/configuration/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." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" -"Después, observe las opciones marcadas con el icono del mundo. Esto quiere " -"decir que solo afectan a la página web en la que está trabajando." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "Por ejemplo, puede establecer funciones específicas como:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," -msgstr "idiomas," #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," -msgstr "nombres de dominio," +msgid "Records and features can be made available:" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," -msgstr "enlaces a redes sociales," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "modo de portal del cliente (B2C vs. B2B)," - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "canales específicos de chat en vivo," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "etc." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "Las otras opciones son generales y se aplican a todos sus sitios web." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" -msgstr "Gestionar nombres de dominio" - -#: ../../content/applications/websites/website/configuration/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." +msgid "Select the website on which the page is currently published." msgstr "" -"Como se mencionó anteriormente, sus sitios web pueden compartir el mismo " -"nombre de dominio o utilizar uno específico. Si lo comparte y quiere adaptar" -" el contenido por región, establezca grupos de países en la configuración de" -" cada sitio web. Se redirigirá a los visitantes a la página web correcta " -"mediante GeoIP." -#: ../../content/applications/websites/website/configuration/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" msgstr "" -"GeoIP se instala de forma predeterminada en Odoo en línea. Si usa Odoo " -"local, no olvide instalar la biblioteca *GeoIP*. Consulte :doc:`on-" -"premise_geo-ip-installation`." -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr ":doc:`/administration/maintain/domain_names`" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 -msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website `." msgstr "" -"Si desea activar un sitio web adicional con su propio nombre de dominio, " -"deberá seguir estos pasos:" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -"Establezca un registro A en la configuración DNS de su proveedor de " -"alojamiento para que se redirija \"www.mywebsite2.ext\" a la IP de su " -"instancia de Odoo." -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" -"Cree un bloque adicional de ``server`` Nginx en el que se establezca el " -"``server_name`` como se definió en el :guilabel:`Dominio del sitio web`." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" -"Actualice y reinicie su instancia de Nginx para utilizar el nuevo bloque de " -"``server``." +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Precio" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "Personalizar la experiencia del visitante" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists `. The following configuration is " +"required:" msgstr "" -"Gracias al menú \"Personalizar\", es posible profundizar en la experiencia " -"del cliente, ya que ofrece opciones de visualización específicas para cada " -"sitio web. Explore las diferentes páginas y adáptelas a su nuevo público. " -"Preste atención a los flujos de trabajo y las páginas automáticas (pago en " -"Comercio electrónico, blogs, eventos, etc.) ya que son las que más opciones " -"tienen." -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" -msgstr "Publicar contenido específico por sitio web" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Reportes" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -"Al igual que las páginas estáticas, cualquier contenido creado desde el " -"frontend (producto, entrada de blog, etc.) solo se publicará en el sitio web" -" actual. Sin embargo, puede cambiarlo desde el formulario de edición en el " -"backend, solo debe dejar el campo *Sitio web* en blanco. Esto hará que se " -"publique en todos sus sitios web." -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" -"Los siguientes son todos los objetos que puede vincular a *uno o todos sus " -"sitios web*:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "Categorías de productos en Comercio electrónico" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "Cursos" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Foros" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Eventos" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Vacantes" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" -"Si crea un registro desde el backend, como un producto o evento, y lo " -"publica, estará visible en todos sus sitios web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "Publicar una página en todos los sitios web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" -"Se crea una nueva página estática que solo está disponible en el sitio web " -"actual. Puede duplicarla de otros sitios web en :menuselection:`Sitio web-->" -" Configuración --> Páginas` y deje el campo *Sitio web* vacío." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" -"Si solo quiere duplicar la página para que sea visible en otro sitio web, " -"duplíquela y establézcala en el sitio web que deseé." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" -"Si vuelve a editar la página, solo se reflejarán los cambios en el sitio web" -" actual. Se duplica una nueva página y se vincula al sitio web, aunque la " -"página original siga vinculada a todos los sitios web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" -"Agrupar las páginas por URL en el gestor de páginas le permite encontrar con" -" rapidez la página original de cada página editada." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multiempresas" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" -"En un entorno de múltiples empresas, cada sitio web se puede vincular a una " -"empresa específica de su sistema." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" -"Con dicha configuración, solo los datos relacionados con la empresa aparecen" -" en el sitio web (productos, trabajos, eventos, etc.)." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" -"Los editores de sitio web solo pueden ver y editar las páginas de los " -"registros a los que tienen acceso, normalmente son los que pertenecen a su " -"empresa actual (y a sus subsidiarias, o empresas hijas en términos de Odoo)." -" Lo mismo pasa con los visitantes al sitio web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" -"Si los sitios web son multiempresa, no necesita cambiar de empresa cuando " -"cambia de sitio web. Para cambiar la empresa y ver el contenido relacionado," -" utilice el selector de empresa en el menú." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "Configurar su sitio web de comercio electrónico" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" -"La función Comercio electrónico es de suma importancia en el entorno de " -"múltiples sitios web. Hicimos que todo el flujo se pueda personalizar para " -"adaptarse al público de cada sitio web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "Productos disponibles solo en un sitio web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" -"Vimos anteriormente cómo publicar un registro específico en solo un sitio " -"web. Puede encontrar el campo \\*sitio web\\* en la pestaña \"comercio " -"electrónico\" del formulario de edición del producto. Si está vacío " -"significa que está disponible para todos los sitios web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "Productos disponibles en *algunos* sitios web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" -"Para hacer que un producto esté disponible en algunos sitios web, pero no en" -" todos, debe duplicar el producto para cada sitio web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" -"Si necesita una referencia única para gestionar dentro de su inventario, " -"debe instalar *Fabricación* y crear LdM (listas de materiales) de tipo " -"*kit*. Cada kit vinculará cada producto \"virtual\" publicado con la " -"referencia principal que gestiona en su inventario. De esta forma, cualquier" -" producto que venda en su sitio web se convertirá en un artículo almacenable" -" en la orden de entrega." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Listas de precios" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" -"Para gestionar precios específicos por sitio web, puede activar la función " -"*múltiples precios por producto* en los ajustes de Sitio web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" -"Luego, vaya a :menuselection:`Sitio web --> Productos --> Listas de precios`" -" para crear listas de precios adicionales. También puede elegir que una " -"lista de precios esté disponible *solo* en un sitio web específico." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr ":doc:`../../ecommerce/managing_products/price_management`." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" -"Dejar el campo vacío significa que funciona en todos los sitios web si se " -"selecciona *seleccionable*. De otra forma, solo está disponible para " -"operaciones en el backend de las aplicaciones Ventas y Punto de venta." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "Proveedores de pago y métodos de entrega" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" -"De forma predeterminada, los proveedores de pago y métodos de entrega " -"publicados se despliegan en todos los sitios web. Puede utilizar proveedores" -" de pago ya especificados por país mediante GeoIP, al definir los países en " -"su configuración. Ahora puede hacerlo por país al completar el campo *Sitio " -"web*." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" -"Hay un ajuste para elegir cómo gestionar las cuentas de cliente en los " -"ajustes de Sitio web. Puede permitir a los clientes utilizar una cuenta en " -"todos sus sitios web o hacer que creen una cuenta para cada sitio web. Esta " -"última opción es conveniente si sus sitios web no deben estar relacionados " -"entre sí en la mente de su visitante." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "Consejos técnicos para personalización" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" -"Si desea publicar objetos personalizados en el sitio web, le damos algunos " -"consejos para que funcione en varios sitios web:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "Mapa de sitio: no olvide el dominio en la ruta para publicar " - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "registros disponibles en cada mapa de sitio de su sitio web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "Acceso: debe llamar al método" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" -"*can_access_from_current_website* en el controlador para asegurar que el " -"visitante pueda ver un registro en el sitio web actual." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" -"Búsqueda: cuando se muestra una lista de registros, no olvide especificar" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" -"el dominio para que solo muestre los registros disponibles en el sitio web." #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 msgid "Geo IP Installation (On-Premises Database)" @@ -5825,10 +5541,6 @@ msgstr "" "vista sean *no actualizables*, esto evitará que el archivo se reinicie " "después de las actualizaciones del sistema." -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Reportes" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" @@ -5878,7 +5590,7 @@ msgstr "" #: ../../content/applications/websites/website/reporting/link_tracker.rst:3 msgid "Link trackers" -msgstr "" +msgstr "Rastreadores de enlaces" #: ../../content/applications/websites/website/reporting/link_tracker.rst:5 msgid "" diff --git a/locale/fr/LC_MESSAGES/administration.po b/locale/fr/LC_MESSAGES/administration.po index 134651653..24984caea 100644 --- a/locale/fr/LC_MESSAGES/administration.po +++ b/locale/fr/LC_MESSAGES/administration.po @@ -5,7 +5,6 @@ # # Translators: # Rémi FRANÇOIS , 2023 -# Jérôme Tanché , 2023 # Eloïse Stilmant , 2023 # Jonathan Castillo , 2023 # JM Mas, 2023 @@ -27,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Jolien De Paepe, 2023\n" "Language-Team: French (https://app.transifex.com/odoo/teams/41243/fr/)\n" @@ -1871,7 +1870,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "Odoo Online" @@ -3819,7 +3818,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -5886,6 +5885,8 @@ msgstr ":ref:`odoo_online/users`" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Mettre à niveau" @@ -6535,280 +6536,348 @@ msgstr "Cette matrice montre le statut d'assistance de chaque version." msgid "**Major releases are in bold type.**" msgstr "**Les versions majeures sont indiquées en gras.**" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "On Premise" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "Date de publication" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "Fin de l'assistance" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" -msgstr "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" +msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "|green|" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "N/A" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "Odoo saas~16.2" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "Mars 2023" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" -msgstr "Juin 2023 (prévu)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" +msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "Odoo saas~16.1" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "Février 2023" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "Avril 2023" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "**Odoo 16.0**" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "Octobre 2022" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "Octobre 2025 (prévu)" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "Odoo saas~15.2" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "|red|" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "Février 2023" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "Avril 2023" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "**Odoo 16.0**" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "Octobre 2022" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "Octobre 2025 (prévu)" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "Odoo saas~15.2" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "Mars 2022" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "Janvier 2023" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "Odoo saas~15.1" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "Février 2022" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "Juillet 2022" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "**Odoo 15.0**" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "Octobre 2021" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "Octobre 2024 (prévu)" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "**Odoo 14.0**" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "Octobre 2020" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "Octobre 2023 (prévu)" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "**Odoo 13.0**" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "Octobre 2019" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "Odoo saas~12.3" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "Août 2019" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "**Odoo 12.0**" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "Octobre 2018" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "Odoo saas~11.3" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "Avril 2018" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "**Odoo 11.0**" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "Octobre 2017" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "Odoo 10.saas~15" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "Mars 2017" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "Odoo 10.saas~14" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "Janvier 2017" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "**Odoo 10.0**" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "Octobre 2016" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "Odoo 9.saas~11" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "Mai 2016" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "**Odoo 9.0**" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "Octobre 2015" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "Odoo 8.saas~6" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "Février 2015" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "**Odoo 8.0**" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "Septembre 2014" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "|green| Version prise en charge" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "|red| Fin de l'assistance" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "N/A Jamais publié pour cette plateforme" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "🏁 Prochaine version, pas encore publiée" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "J'utilise une ancienne version d'Odoo/OpenERP/TinyERP" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" "OpenERP 7.0, 6.1, 6.0 et 5.0 ne sont plus pris en charge, quelle que soit la" " plateforme." -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" "TinyERP 4.0, 3.0, 2.0 et 1.0 ne sont plus pris en charge, quelle que soit la" " plateforme." -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version `_." @@ -7613,7 +7682,7 @@ msgstr "" "provoquer d'effets secondaires si elles sont lancées plus souvent que prévu." #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "Sous-modules" @@ -8056,7 +8125,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "Développement" @@ -8243,8 +8312,8 @@ msgid "Tabs" msgstr "Onglets" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "Historique" @@ -8281,8 +8350,8 @@ msgstr "" "données en cliquant sur le bouton *connect*." #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "Emails" @@ -8344,7 +8413,7 @@ msgstr "" "même des consoles shell Odoo." #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "Monitoring" @@ -8364,8 +8433,8 @@ msgstr "" "de la base de données, git push, etc.)." #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "Journaux" @@ -8429,7 +8498,7 @@ msgstr "" "cliquant sur le bouton Play." #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "Sauvegardes" @@ -8571,9 +8640,9 @@ msgstr ":doc:`Mise à niveau - Odoo.sh <../../upgrade/odoo_sh>`" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "Paramètres" @@ -11023,61 +11092,50 @@ msgstr "" "De plus, ils ne peuvent pas utiliser le webshell et n'ont pas accès aux " "journaux du serveur." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "Utilisateur" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "Admin" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "1-click connect" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "Shell/SSH" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "Production & Simulation" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "Statut" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "Accès public" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "Autorisez l'accès public à vos builds de développement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." @@ -11085,7 +11143,7 @@ msgstr "" "Si cette option est activée, elle expose la page Builds publiquement, " "permettant aux visiteurs de se connecter à vos builds de développement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." @@ -11093,7 +11151,7 @@ msgstr "" "De plus, les visiteurs ont accès aux journaux, au shell et aux emails de vos" " builds de développement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." @@ -11101,11 +11159,11 @@ msgstr "" "Les builds de production et de simulation sont exclus, les visiteurs peuvent" " uniquement voir leur statut." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "Domaines personnalisés" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab `." @@ -11114,7 +11172,7 @@ msgstr "" "des paramètres ` de la branche" " correspondante." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." @@ -11123,7 +11181,7 @@ msgstr "" "comme sous-modules dans vos branches pour permettre à Odoo.sh de les " "télécharger." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -11135,7 +11193,7 @@ msgstr "" "instructions dans le chapitre :ref:`Sous-modules ` de cette documentation." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -11147,14 +11205,14 @@ msgstr "" " de déploiement pour Odoo.sh, pour que le serveur Git distant permette à " "notre plateforme de télécharger les révisions de ce dépôt privé." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" "Pour configurer la clé de déploiement pour un dépôt privé, procédez comme " "suit :" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," @@ -11162,11 +11220,11 @@ msgstr "" "dans le champ, collez l'URL SSH de votre sous-dépôt privé et cliquez sur " "*Add*," -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "par ex. *git@github.com:USERNAME/REPOSITORY.git*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" @@ -11174,16 +11232,16 @@ msgstr "" "il peut s'agir d'un autre serveur Git que Github, tel que Bitbucket, Gitlab " "ou même votre propre serveur auto-hébergé" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "copiez la clé publique," -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "" "elle devrait ressembler à *ssh-rsa some...random...characters...here...==*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." @@ -11191,21 +11249,21 @@ msgstr "" "dans les paramètres du sous-dépôt privé, ajoutez la clé publique aux clés de" " déploiement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" "Github.com : :menuselection:`Settings --> Deploy keys --> Add deploy key`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "Bitbucket.com : :menuselection:`Settings --> Access keys --> Add key`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "Gitlab.com : :menuselection:`Settings --> Repository --> Deploy Keys`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" @@ -11213,24 +11271,24 @@ msgstr "" "Auto-hébergé : ajoutez la clé au fichier authorized_keys de l'utilisateur " "git dans son répertoire .ssh" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "Taille de stockage" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "" "Cette section présente la taille de stockage utilisée par votre projet." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "La taille de stockage est calculée comme suit :" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "la taille de la base de données PostgreSQL" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." @@ -11238,7 +11296,7 @@ msgstr "" "la taille des fichiers disques disponibles dans votre conteneur : filestore " "de la base de données, répertoire de stockage des sessions, ..." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "`_ in your Web Shell." @@ -11246,7 +11304,7 @@ msgstr "" "Si vous voulez analyser l'utilisateur du disque, vous pouvez exécuter " "l'outil `ncdu `_ dans votre Web Shell." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." @@ -11255,11 +11313,11 @@ msgstr "" " dans votre abonnement, elle sera automatiquement synchronisée avec celui-" "ci." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "Workers de base de données" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " @@ -11270,7 +11328,7 @@ msgstr "" " base de données de production est en mesure de gérer. Si vous en ajoutez, " "ils seront automatiquement synchronisés avec votre abonnement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -11285,11 +11343,11 @@ msgstr "" "personnalisations, vous pouvez ouvrir un ticket `ici " "`_." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "Branches de simulation" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " @@ -11299,11 +11357,11 @@ msgstr "" "de tester plus de fonctionnalités en même temps. Si vous en ajoutez, elles " "seront automatiquement synchronisées avec votre abonnement." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "Activation" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/fr/LC_MESSAGES/finance.po b/locale/fr/LC_MESSAGES/finance.po index b9727b2b1..b0370c939 100644 --- a/locale/fr/LC_MESSAGES/finance.po +++ b/locale/fr/LC_MESSAGES/finance.po @@ -22,12 +22,8 @@ # Xavier Symons , 2022 # Vallen Delobel , 2022 # Arnaud Willem , 2022 -# Ludvig Auvens , 2022 # Camille Dantinne , 2022 -# Khadija Mbazaa , 2022 -# 0169fee580ff5de3f9b7241d14f30af9_5f30934 <1948a2319336319ed4429b6139c8c1c2_916898>, 2022 # Olivier ANDRE , 2022 -# Jérôme Tanché , 2022 # ae421c2293dd329c1e0f68f8f29fafa8_9d513c4, 2023 # 5cad1b0f1319985f8413d48b70c3c192_b038c35, 2023 # laje_odoo, 2023 @@ -35,18 +31,19 @@ # romrik_, 2023 # jb78180 , 2023 # Cécile Collart , 2023 +# Martin Trigaux, 2023 # Fernanda Marques , 2023 # Jolien De Paepe, 2023 -# Martin Trigaux, 2023 +# Jérôme Tanché , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" +"Last-Translator: Jérôme Tanché , 2023\n" "Language-Team: French (https://app.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -577,10 +574,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -604,7 +601,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4386,6 +4383,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterms" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "Processus de facturation" @@ -6522,6 +6610,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -8101,10 +8190,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -8116,101 +8204,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Rapports de suivi" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Rapports de suivi" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -8222,11 +8342,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -8234,15 +8354,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr ":doc:`../../../general/in_app_purchase`" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -10454,19 +10574,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade ` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install ` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code ` " "for all newly created invoice and refund transactions. Under " @@ -10476,23 +10588,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule ` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -10500,7 +10600,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -10512,21 +10612,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "Configuration du produit" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Code de la marchandise" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -10534,24 +10634,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -10559,7 +10659,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -10568,39 +10668,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes ` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -10611,96 +10711,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -10710,73 +10787,73 @@ msgid "" ":ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country `, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value `, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -11145,7 +11222,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -12479,7 +12556,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr ":doc:`fiscal_positions`" @@ -12654,52 +12731,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions ` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -12707,29 +12765,15 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module ` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping `." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "Positions fiscales et taxes" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" -"Une fois activée, la fonctionnalité crée automatiquement toutes les taxes et" -" positions fiscales nécessaires pour chaque État membre de l'UE, en fonction" -" du pays de votre entreprise." - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." @@ -12737,23 +12781,46 @@ msgstr "" "Nous vous recommandons vivement de vérifier que la cartographie proposée est" " adaptée aux produits et services que vous vendez avant de l'utiliser." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" -msgstr "Actualiser la cartographie des taxes" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 -msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -"Chaque fois que vous ajoutez ou modifiez des taxes, vous pouvez mettre à " -"jour automatiquement vos positions fiscales." -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Rapports" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +msgid "" +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -13404,11 +13471,11 @@ msgstr "" "sur la moitié du prix, mais cela peut être inattendu du point de vue de " "l'utilisateur." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" -msgstr "Validation du numéro de TVA Intracommunautaire par VIES" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" +msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" @@ -13419,7 +13486,7 @@ msgstr "" " la validité des numéros de TVA des entreprises enregistrées dans l'Union " "européenne." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " @@ -13429,7 +13496,7 @@ msgstr "" " vous enregistrez un contact. Cela vous aide à vous assurer que vos contacts" " vous ont fourni un numéro de TVA valide sans quitter l'interface Odoo." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " @@ -13439,15 +13506,15 @@ msgstr "" "Configuration --> Paramètres --> Taxes`, activez la fonction **Vérifier les " "numéros de TVA** et cliquez sur *Enregistrer*." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "Validation du numéro de TVA" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." @@ -13455,13 +13522,13 @@ msgstr "" "Lors de la création ou modification d'un contact, assurez-vous de compléter " "le champ **Pays** et **TVA**." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." @@ -13470,13 +13537,13 @@ msgstr "" "numéro de TVA et affiche un message d'erreur si le numéro de TVA n'est pas " "valide." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." @@ -13484,7 +13551,7 @@ msgstr "" "Cet outil vérifie la validité du numéro de TVA mais ne vérifie pas la " "validité des autres champs." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "`__" @@ -13517,7 +13584,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manuellement" @@ -14978,433 +15044,920 @@ msgstr "Notes de frais" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -"**Odoo Dépense** simplifie la gestion des dépenses. Les employés peuvent " -"soumettre leurs dépenses ; les gestionnaires peuvent les approuver ; les " -"comptables peuvent les enregistrer et traiter les paiements." -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "`Odoo Dépenses : page produit `_" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "Comment configurer les types de dépenses" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"La première étape pour faire le suivi de vos dépenses est la configuration " -"des types de dépenses (gérés comme produits dans Odoo) autorisées par votre " -"entreprise, depuis le menu *Configuration*. Lorsqu'une dépense spécifique " -"est remboursée à un prix fixe, définissez un coût pour le produit. Sinon, " -"maintenez le coût à 0,0 et les employés indiqueront le coût réel par " -"dépense." -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "Restaurant :" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "Coût : 0.00 (le coût du ticket sera enregistré sur chaque dépense)." - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "Déplacement avec une voiture personnelle :" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" -"Coût : 0.30 (le prix du kilomètre remboursé par l'entreprise est fixe)." #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "Hôtel :" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "Autres :" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "Côut: 0.0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price `. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"` to " +"learn more about units of measure and how to configure them." msgstr "" -"N'oubliez pas de définir une taxe de dépense sur chaque type de dépense (et " -"un compte si vous utilisez Odoo Comptabilité). Il est généralement " -"recommandé d'utiliser une taxe configurée avec :ref:`Taxe incluse dans le " -"prix `. De cette façon, les employés déclarent les " -"dépenses avec des prix incluant les taxes, ce qui est généralement le " -"comportement attendu." -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" -"L'application *Vente* vous permet de spécifier des unités de mesure pour vos" -" types de dépenses (unités, miles, nuits, etc.). Allez dans : choix de menu " -":`Vente --> Configuration --> Paramètres` et cochez *Certains produits " -"peuvent être vendus/achetés dans différentes unités de mesure (avancées)*." #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "Comment enregistrer les dépenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -"En tant qu'employé (employé en droits d'accès), vous pouvez enregistrer vos " -"dépenses depuis :menuselection:`Mes dépenses --> Dépenses à soumettre`." -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" -"Sélectionnez le produit concerné et introduisez soit le montant total que " -"vous avez payé (avec Quantité = 1) soit le prix unitaire si la quantité est " -"comptabilisable (par ex. le nombre de nuits d'hôtel)." #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "Entrez la date de la dépense." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"`. Taxes will be automatically configured if this " +"is set." msgstr "" -"Indiquez si vous avez payé la facture vous-même (et souhaitez être " -"remboursé) ou si l'entreprise l'a payée directement (par ex. si vous avez " -"utilisé la carte de crédit de l'entreprise)." -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" -"Définissez la référence de la facture, ajoutez quelques notes si nécessaire " -"et joignez une photo ou scan du reçu provenant du fil de discussion. Cela " -"aidera le responsable et le comptable à valider votre demande." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "En un clic depuis les emails" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "" -"Permettez à vos employés d'enregistrer leurs dépenses depuis un simple " -"email. Faites une capture d'écran du reçu et envoyez-la par mail ou " -"transmettez simplement une facture!" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"Tout ce dont vous avez à faire c'est configurer l'alias de l'email dans " -":menuselection:`Dépenses --> Configuration --> Paramètres` (par ex. " -"*dépenses* @mycompany.odoo.com). Pour des raisons de sécurité, seuls les " -"emails provenant d'employés authentifiés sont acceptés (cfr. *Email " -"professionnel* dans le formulaire de renseignement sur les employés)." -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -"Le produit de dépense est défini automatiquement si l'objet du courrier " -"contient la référence interne du produit en première position. Tapez le " -"montant de la dépense dans l'objet du courrier pour le définir également sur" -" la dépense (par exemple, Ref001 Food 100€)." -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "Comment soumettre des dépenses aux responsables" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -"Dès que vous êtes prêt à soumettre vos notes de frais à votre responsable " -"(par ex. à la fin d'un voyage d'affaires, ou une fois par mois), allez au " -"menu :menuselection:`Mes notes de frais --> Notes de frais à soumettre`. " -"Sélectionnez toutes les dépenses de la liste et cliquez sur " -":menuselection:`Action --> Soumettre au responsable`. Enregistrez le nouveau" -" rapport que vous venez de créer (c-à-d la série de dépenses) et attendez " -"l'approbation de votre responsable." -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -"Vous pouvez également soumettre vos notes de frais une par une depuis le " -"bouton *Soumettre au responsable* dans la vue formulaire d'une dépense." -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -"Tous vous rapports de dépenses soumis se trouvent dans " -":menuselection:`Dépenses --> Mes dépenses --> Rapports de dépenses`." -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "Comment approuver les dépenses" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"L'équipe RH et l'équipe de responsables ont accès à un aperçu de tous les " -"rapports de dépenses à valider à partir du menu principal :menuselection:`À " -"approuver --> Rapports de dépenses à approuver`. Ces utilisateurs doivent " -"avoir au moins des droits d'accès *Administrateurs* pour les *Dépenses*." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -"Grâce à l'outil de communication intégrée, ils peuvent revoir les rapports " -"de dépenses, les approuver ou les rejeter, et également faire des " -"commentaires." -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -"En tant que responsable vous pouvez facilement avoir accès aux rapports de " -"dépenses des membres de votre équipe. Pour cela, vous devez être défini " -"comme responsable dans le formulaire de renseignement de vos employés." -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "Comment publier des dépenses dans la comptabilité" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"Pour vérifier les comptes, les produits et les taxes, le service comptable " -"doit, une fois les rapports de dépenses approuvés par les responsables, " -"aller à :menuselection:`Dépenses --> Comptabilité --> Rapports de dépenses à" -" publier`. Pour publier les écritures comptables correspondantes dans vos " -"livres, ils peuvent cliquer sur *Publier les écritures comptables*. Pour ce " -"faire, ils doivent disposer des droits d'accès suivants :" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Comptabilité : comptable ou conseiller" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Dépenses : responsable" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"Pour publier une dépense, il faut qu'une *adresse privée* soit configurée " -"pour l’employé. Si vous recevez un message d'erreur lors de la publication, " -"cliquez sur employé, allez à l'onglet *Données privées* et " -"sélectionnez/créez un contact pour l'employé dans le répertoire. Si la " -"personne en question utilise Odoo, un contact sera automatiquement créé." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "Comment rembourser les employés" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"Vous avez désormais accès à tous les rapports de dépenses à rembourser dans " -":menuselection:`Dépenses --> Comptabilité --> Rapports de dépenses à payer`." -" Pour enregistrer le paiement ou payer par chèque, cliquez sur *Enregistrer " -"un paiement*." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "" -"Pour savoir comment gérer facilement le processus de paiement dans Odoo :" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "Comment refacturer des dépenses à vos clients ?" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -"Si vous faites le suivi des dépenses dans vos projets clients, vous pouvez " -"facturer automatiquement vos clients." -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "Explication :" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Comptabilité : comptable ou conseiller" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Dépenses : responsable" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "Refacturer des notes de frais aux clients" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Configuration" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "Activez la **Facturation client** dans les paramètres des dépenses." - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -"Allez au menu de configuration du produit et configurez le mode de " -"facturation sur tous vos types de dépenses :" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -"Quantités commandées : Les dépenses seront facturées en fonction de la " -"quantité commandée" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -"Quantités livrées : Les dépenses seront facturées en fonction de la quantité" -" livrée" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." -msgstr "Au coût : les dépenses seront facturés selon leur coût réel." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" +msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -"Au prix de vente : la facturation se fera sur la base du prix de vente " -"indiqué sur le bon de commande." -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "Créer une commande" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -"En tant que vendeur, créez et confirmez des ordres de vente pour les " -"services fournis à vos clients. Si vous n'ajoutez aucune dépense sur l'ordre" -" de vente, cela se fera automatiquement lors de sa publication par le " -"comptable." -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "Relier la dépense à l'ordre de vente" +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "Soumettre, valider et afficher les dépenses" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense `, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -"En tant que responsable, assurez-vous que le compte analytique est configuré" -" sur chaque ligne des rapports des dépenses approuvées. S'il en manque une, " -"cliquez sur la ligne pour l'ajouter. Les employés peuvent déjà les " -"configurer lorsqu'ils les soumettent." -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "En tant que comptable, publiez les écritures du journal." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses `. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries `. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "Facturez les dépenses" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"Vous pouvez à présent facturer l'ordre de vente. Elle apparaît dans " -":menuselection:`Ventes --> Facturation --> Ventes` À facturer. Les dépenses " -"ont automatiquement été ajoutées aux lignes de commande. Ces postes " -"apparaissent en bleu (c'est à dire à facturer)." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "e (par ex. à facturer)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -17036,10 +17589,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Rapports" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -26526,7 +27075,7 @@ msgid "" "works with the following PACs: `Solución Factible " "`_, `Quadrum (formerly Finkok) " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -26838,7 +27387,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum `_, `Solución Factible " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -31513,7 +32062,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "Onglet Identifiants" @@ -31751,14 +32299,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -31766,7 +32314,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -31850,26 +32398,36 @@ msgstr "Clé API et Clé Client" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "Clé HMAC" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -31881,7 +32439,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -31891,7 +32449,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -31902,36 +32460,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "Vous devez enregistrer le webhook pour finaliser sa création." -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "URLs" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Compte d'Adyen" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "Autoriser les paiements d'une origine spécifique" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -31943,26 +32545,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "Faire une réservation sur une carte" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -31972,21 +32574,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -32847,7 +33449,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "Paramètres dans Odoo" @@ -32861,196 +33463,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal `_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal `_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" -msgstr "" -"Odoo a besoin de vos **identifiants API** pour se connecter à votre compte " -"PayPal, ils comprennent :" - -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"`, :ref:`PDT `, and :ref:`IPN ` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" +msgstr "Retour automatique" + +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "Transfert des données de paiement (PDT)" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"` and :ref:`Payment Data Transfer (PDT) ` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" -msgstr "" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" +msgstr "Notification instantanée de paiement (IPN)" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees `_ to set up fees." -msgstr "" -"Vous pouvez vous référer à `Frais Paypal " -"`_ afin de configurer les " -"frais." - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" -"`Les commerçants de l'UE " -"`_ ne sont pas autorisés à facturer des frais supplémentaires " -"pour les paiements par cartes de crédits." - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "Paramètres sur Paypal" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "Compte Paypal optionnel" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" -"Nous vous conseillons de ne pas inciter vos clients à se connecter avec un " -"compte Paypal lorsqu'ils règlent leurs achats. Laissez-les payer également " -"avec des cartes de débit ou de crédit, ou vous pourriez perdre certaines " -"affaires. Assurez-vous que ce paramètre est activé." - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "Format des messages de paiement" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 +#: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account `_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "Votre compte Paypal est prêt !" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation ` _." -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account `, then follow " "this `link Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees ` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site `_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees `_ to set up fees." +msgstr "" +"Vous pouvez vous référer à `Frais Paypal " +"`_ afin de configurer les " +"frais." + +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"`_ are not allowed to charge extra fees for paying " +"with credit cards." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "Environnement de test" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site `_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"`_)." +"`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com `_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" "Lancez une transaction test depuis Odoo en utilisant le compte personnel " diff --git a/locale/fr/LC_MESSAGES/inventory_and_mrp.po b/locale/fr/LC_MESSAGES/inventory_and_mrp.po index 83202fb9c..7869d84ff 100644 --- a/locale/fr/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/fr/LC_MESSAGES/inventory_and_mrp.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Jolien De Paepe, 2023\n" "Language-Team: French (https://app.transifex.com/odoo/teams/41243/fr/)\n" @@ -6715,13 +6715,9 @@ msgstr "Configurer des routes en plusieurs étapes" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" -"Assurez-vous d'abord que l'option :guilabel:`Routes en plusieurs étapes` est" -" activée dans :menuselection:`Inventaire --> Configuration --> Paramètres`, " -"dans la section :guilabel:`Entrepôt`. Après avoir activé le paramètre, " -":guilabel:`sauvegardez` les changements." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 msgid "" @@ -6770,19 +6766,10 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" -"L'activation des réceptions et livraisons en deux étapes créera de nouveaux " -"emplacements d'*entrée* et de *sortie*, qui sont libellés par défaut " -":guilabel:`WH/Input` et :guilabel:`WH/Output`, respectivement, dans le " -"tableau de bord des :guilabel:`Emplacements`. Pour renommer ces " -"emplacements, allez à :menuselection:`Configuration --> Emplacements`, " -"sélectionnez l':guilabel:`Emplacement` à modifier et cliquez sur " -":guilabel:`Éditer`. Sur le formulaire de l'emplacement, mettez à jour le " -":guilabel:`Nom de l'emplacement`, faites d'autres changements (le cas " -"échéant) et :guilabel:`sauvegardez` les changements." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:67 msgid "Process a receipt in two steps (input + stock)" @@ -6791,28 +6778,19 @@ msgstr "Traiter une réception en deux étapes (Emplacement d'entrée + stock)" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." msgstr "" -"Pour les entreprises disposant de plusieurs entrepôts avec des " -"configurations d'étapes différentes, le champ :guilabel:`Livrer à` sur le " -"bon de commande peut avoir besoin d'être précisé comme l'*emplacement " -"d'entrée* correct lié à l'entrepôt en deux étapes. Pour ce faire, " -"sélectionnez l'entrepôt dans la liste déroulante qui comprend le libellé " -"`Réceptions` à la fin du nom." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" -"Après avoir confirmé le bon de commande, un bouton intelligent " -":guilabel:`Réception` apparaîtra dans le coin supérieur droit du bon de " -"commande - le fait de cliquer dessus affiche le reçu associé à la commande. " #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_three_steps.rst-1 @@ -6913,24 +6891,16 @@ msgstr "Traiter un bon de livraison en deux étapes (transfert + expédition)" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" -"Dans l'application :menuselection:`Ventes`, créez un nouveau devis en " -"cliquant sur :guilabel:`Créer`. Sélectionnez (ou créez) un " -":guilabel:`Client`, ajoutez un :guilabel:`Produit` stockable aux lignes de " -"commande et cliquez sur :guilabel:`Confirmer`." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" -"Après avoir confirmé la commande, un bouton intelligent " -":guilabel:`Réception` apparaîtra dans le coin supérieur droit du bon de " -"livraison - le fait de cliquer dessus affiche le reçu associé." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 msgid "" @@ -6963,13 +6933,9 @@ msgstr "Traiter le transfert" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" -"Les bons de transfert et de livraison seront créés une fois la commande " -"confirmée. Lorsque le bouton intelligent :guilabel:`Livraison` apparaît, " -"cliquez dessus pour accéder au tableau de bord des :guilabel:`Transferts`, " -"qui répertorie tous les bons de transfert et de livraison." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 msgid "" @@ -7028,14 +6994,10 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" -"Il est également possible d'accéder rapidement au bon de livraison associé à" -" la commande en cliquant à nouveau sur le bouton intelligent " -":guilabel:`Livraison` et en choisissant le bon de livraison sur la page des " -"::guilabel:`Transferts` (qui devrait être marqué comme :guilabel:`Prêt`)." #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 msgid "The delivery order can be seen in the Inventory Kanban view." diff --git a/locale/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po index b0cee9626..49e5d4d4b 100644 --- a/locale/fr/LC_MESSAGES/sales.po +++ b/locale/fr/LC_MESSAGES/sales.po @@ -14,18 +14,18 @@ # Priscilla (prs) Odoo , 2022 # Fernanda Marques , 2022 # Maxime Chambreuil , 2023 -# Martin Trigaux, 2023 # Cécile Collart , 2023 # Jolien De Paepe, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Jolien De Paepe, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: French (https://app.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,6 +94,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -2178,12 +2179,10 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users ` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" -"Plusieurs utilisateurs peuvent être connectés à la même session en même " -"temps. Cependant, la session ne peut être ouverte qu'une seule fois dans le " -"même navigateur." #: ../../content/applications/sales/point_of_sale.rst:32 msgid "Sell products" @@ -2191,16 +2190,11 @@ msgstr "Vendre des produits" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" -"Cliquez sur des produits pour les ajouter au panier. Pour changer la " -"**quantité**, cliquez sur :guilabel:`Qté` et saisissez le nombre de produits" -" à l'aide du clavier. Pour ajouter une **remise** ou modifier le **prix** du" -" produit, cliquez respectivement sur :guilabel:`% de remise` ou " -":guilabel:`Prix` et saisissez les montants." #: ../../content/applications/sales/point_of_sale.rst:38 msgid "" @@ -2233,48 +2227,31 @@ msgstr "" "sans choisir le mode de paiement." #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "Enregistrer des clients" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"`, automatically apply the :doc:`attributed " +"pricelist `, or :ref:`generate and print " +"an invoice `." msgstr "" -"L'enregistrement de vos clients vous donne la possibilité de leur accorder " -"différents privilèges tels que des remises, un programme de fidélité ou " -"encore une communication spécifique. L'enregistrement est également " -"nécessaire s'ils veulent une facture ou rend toute interaction future avec " -"eux plus rapide." -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "Depuis votre interface de session, utilisez le bouton client." - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "Créez-en un nouveau en utilisant ce bouton." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "Vous serez invité à compléter le formulaire client." - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" -"Utilisez le bouton de sauvegarde lorsque vous avez terminé. Vous pouvez " -"ensuite sélectionner ce client dans toutes les transactions futures." - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "Notes au client" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session `. For instance, to provide cleaning " @@ -2287,7 +2264,7 @@ msgstr "" "également être utilisées pour suivre la demande particulière d'un client, " "par exemple s'il ne souhaite pas que le produit soit assemblé pour lui." -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " @@ -2297,7 +2274,7 @@ msgstr "" "client` sur le pavé. Cela ouvre une fenêtre contextuelle dans laquelle vous " "pouvez ajouter ou modifier le contenu de la note." -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO ` " "are displayed identically in the cart." @@ -2313,7 +2290,7 @@ msgstr "" "Bouton Note au client et notes (commande et session PdV) sur les produits " "dans le panier" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -2329,36 +2306,36 @@ msgstr "" "Le reçu du client avec des notes provenant d'une commande et de la " "fonctionnalité de note au client." -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "Retourner et rembourser des produits" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "Pour retourner et rembourser un produit," -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" ":ref:`démarrez une session ` à partir du **tableau de " "bord du Point de Vente** ;" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" "cliquez sur :guilabel:`Remboursement` et sélectionnez la commande concernée " ";" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" "sélectionnez le produit et la quantité à rembourser à l'aide du clavier ;" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "cliquez sur :guilabel:`Rembourser` pour revenir à l'écran précédent ;" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" @@ -2366,7 +2343,7 @@ msgstr "" "une fois la commande terminée, cliquez sur :guilabel:`Paiement` pour " "procéder au remboursement ;" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -2378,7 +2355,7 @@ msgstr "" msgid "refund view from a POS" msgstr "Vue remboursement dans un point de vente" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." @@ -2387,7 +2364,7 @@ msgstr "" ":guilabel:`numéro de reçu`, de la :guilabel:`date` ou du :guilabel:`client` " "en utilisant la barre de recherche." -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -2400,11 +2377,11 @@ msgstr "" ":guilabel:`Qté` et :guilabel:`+/-`, puis sur la quantité de produits " "retournés." -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "Fermer la session du PdV" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " @@ -2415,18 +2392,18 @@ msgstr "" "contextuelle :guilabel:`Fermeture de session`. À partir de cet écran, vous " "pouvez récupérer diverses informations :" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" "le nombre de commandes effectuées et le montant total réalisé au cours de la" " session ;" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "les montants attendus regroupés par mode de paiement." -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -2447,7 +2424,7 @@ msgstr "" msgid "How to close a POS session." msgstr "Comment fermer une session du PdV." -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." @@ -2456,7 +2433,7 @@ msgstr "" ":guilabel:`Fermer la session` pour fermer et revenir au **tableau de bord du" " PdV**." -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." @@ -2464,7 +2441,7 @@ msgstr "" "Vous pouvez laisser la session ouverte en cliquant sur :guilabel:`Backend` " "ou l'interrompre et continuer à vendre en cliquant sur :guilabel:`Annuler`." -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " @@ -2475,14 +2452,14 @@ msgstr "" "espèces comptées. Pour la fermer quand même, cliquez sur :guilabel:`Ok` sur " "l'écran :guilabel:`Écart de règlement`." -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" "Il est fortement conseillé de fermer votre session de PdV à la fin de chaque" " journée. " -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -3202,119 +3179,111 @@ msgid ":doc:`epos_ssc`" msgstr ":doc:`epos_ssc`" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" -msgstr "Se connecter avec les employés" +msgid "Multi-employee management" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS ` and :ref:`keep" +" track of the employees involved in each order `." msgstr "" -"Avec Odoo *Point de Vente*, vous pouvez gérer plusieurs cassiers. Cette " -"fonctionnalité vous permet de savoir qui travaille et quand et combien " -"chaque caissier a gagné pour cette session." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings ` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -"Dans Odoo, il existe trois façons de changer de caissier : *sélectionner un " -"caissier*, *saisir un code PIN* ou *scanner un code-barres*." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge ` or selecting their name from the list of " +"allowed employees to :ref:`open the session `." msgstr "" -"Pour gérer plusieurs cassiers, vous avez besoin de plusieurs employés (au " -"moins deux)." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" -msgstr "Configurer la connexion avec les employés" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session `, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -"Pour activer cette fonctionnalité, allez à *Paramètres PdV* et cochez la " -"case Se connecter avec les employées sur votre *formulaire PdV*. Puis, " -"ajoutez les employés qui ont accès à la caisse enregistreuse." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." -msgstr "Vous pouvez maintenant facilement changer de caissier." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "Changer sans code PIN" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -"La façon la plus facile pour changer de caissier est sans code. Pour ce " -"faire, cliquez sur le nom du caissier dans votre interface PdV." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." -msgstr "Maintenant, il vous suffit de cliquer sur votre nom." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "Changer de caissier avec code PIN" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" -"Vous pouvez configurer un code PIN pour chaque caissier. Il suffit d'aller " -"sur le formulaire de l'employé et d'ajouter un code PIN dans l'onglet " -"*Paramètres RH*." #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" -"Maintenant, lors que vous souhaitez changer de caissier, un code PIN sera " -"demandé." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "Changer de caissier avec un code-barres" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -"Vous pouvez demander à vos employés de s'identifier avec leurs badges. Il " -"suffit de configurer un code-barres là où vous avez ajouté le code PIN. " -"Imprimez le badge et lorsqu'un employé le scannera, il deviendra le " -"caissier." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "Retrouver qui était le caissier" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -"Après avoir fermé votre *session PdV*, vous pouvez avoir un aperçu du " -"montant vendu par chaque caissier. Pour cela, allez au menu des commandes." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analytics" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" -"Vous pouvez à présent ouvrir la commande et obtenir un aperçu des produits " -"vendus." #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 msgid "Payment methods" @@ -5134,11 +5103,11 @@ msgstr "" "recherche. Tapez votre référence et cliquez sur :guilabel:`Numéro de reçu`, " ":guilabel:`Date`, ou :guilabel:`Client`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Factures clients" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." @@ -5146,11 +5115,11 @@ msgstr "" "Dans le Point de vente, vous pouvez émettre et imprimer des factures lors du" " paiement à la caisse ou récupérer toutes les commandes passées facturées." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "Définir un client" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -5166,7 +5135,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "sélection de client et bouton de création" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -5178,7 +5147,7 @@ msgstr "" "Vous ouvrez ainsi un formulaire de création de client à compléter. Cliquez " "sur :guilabel:`Sauvegarder` pour valider et paramétrer ce nouveau client." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." @@ -5186,7 +5155,7 @@ msgstr "" "Vous pouvez aussi **modifier** les informations du client en cliquant sur " ":guilabel:`Détails`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." @@ -5194,11 +5163,11 @@ msgstr "" "Si vous n'avez pas défini votre client lors de la commande, vous pouvez le " "faire à l'écran de paiement en cliquant sur :guilabel:`Client`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "Facturer un client" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -5213,7 +5182,7 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "bouton pour générer une facture dans le PdV" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." @@ -5222,15 +5191,15 @@ msgstr "" "**facture** est automatiquement émise et prête à être téléchargée et/ou " "imprimée." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "Récupérer des factures" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "Pour récupérer des factures à partir du **tableau de bord du PdV**," -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" @@ -5238,7 +5207,7 @@ msgstr "" "accédez à toutes les commandes passées par votre Point de vente en allant au" " :menuselection:`Point de vente --> Commandes --> Commandes`;" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -5251,7 +5220,7 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "bouton intelligent de facture sur un formulaire de commande" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." @@ -5259,7 +5228,7 @@ msgstr "" "Les **Commandes facturées** peuvent être identifiées par le statut " ":guilabel:`Facturé` dans la colonne :guilabel:`Statut`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." @@ -5267,11 +5236,11 @@ msgstr "" "Vous pouvez filtrer la liste des commandes sur les commandes facturées en " "cliquant sur :guilabel:`Filtres` et :guilabel:`Facturé`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "Codes QR pour générer des factures" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -5292,7 +5261,7 @@ msgstr "" msgid "order status change" msgstr "Changement du statut de la commande" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -6143,13 +6112,10 @@ msgstr "Enregistrer les employés" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access ` to the POS and :ref:`use " -"barcodes to log your employees in ` your POS." +":ref:`restrict access ` to the POS and " +":ref:`use barcodes to log your employees in ` your " +"POS." msgstr "" -"Vous pouvez également utiliser un lecteur de code-barres pour enregistrer " -"vos employés. Pour ce faire, :ref:`limitez l'accès ` " -"au point de vente et :ref:`utilisez des codes-barres pour enregistrer vos " -"employés dans ` votre point de vente." #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 msgid "Sales orders" diff --git a/locale/fr/LC_MESSAGES/websites.po b/locale/fr/LC_MESSAGES/websites.po index 72bf2694a..94b3c19f8 100644 --- a/locale/fr/LC_MESSAGES/websites.po +++ b/locale/fr/LC_MESSAGES/websites.po @@ -4,7 +4,6 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Jérôme Tanché , 2022 # Olivier Lenoir , 2022 # André Madeira Cortes , 2022 # 2bb6a6c9c26c6796aa3f72da499aab31_c4bf95e <50ab448b17d7dd714d37f715e9558f9f_400401>, 2022 @@ -12,17 +11,17 @@ # Shark McGnark , 2022 # Cécile Collart , 2023 # Eloïse Stilmant , 2023 -# Martin Trigaux, 2023 # Jolien De Paepe, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Jolien De Paepe, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: French (https://app.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -654,7 +653,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr ":doc:`../checkout_payment_shipping/checkout`" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -919,7 +918,7 @@ msgid "eCommerce management" msgstr "Gérer un eCommerce" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "Comptes clients" @@ -1581,6 +1580,7 @@ msgstr "" "feuille de calcul`, etc." #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analytics" @@ -1630,7 +1630,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr ":doc:`/applications/websites/website/reporting/plausible`" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Produits" @@ -2448,11 +2447,11 @@ msgid "" msgstr "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "Configuration des prix : listes de prix" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -2472,12 +2471,12 @@ msgstr "" "ajoutée, la **liste de prix publique** sera utilisée par défaut sur tous les" " sites web." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -2490,15 +2489,15 @@ msgstr "" " descendez jusqu'à la section :guilabel:`Boutique - Produits`. Vous y " "trouverez deux options :" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr ":guilabel:`Plusieurs prix par produit` ;" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr ":guilabel:`Règles de prix avancées (remises, formules)`." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -2511,11 +2510,11 @@ msgstr "" "des règles de *modification des prix*, telles que les **remises**, " "**marges**, **arrondis**, etc." -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "Devise étrangère" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -2531,15 +2530,15 @@ msgstr "" msgid "Pricelists selection" msgstr "Sélection des listes de prix" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "Remise permanente" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -2555,7 +2554,7 @@ msgstr "" msgid "Price strikethrough" msgstr "Prix barré" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -4003,580 +4002,287 @@ msgstr "" msgid "Multiple websites" msgstr "Sites web multiples" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -"Les sites web multiples d'Odoo offrent à votre entreprise de larges " -"possibilités de diversification et de segmentation de la clientèle. Une " -"audience démultipliée et des revenus stimulés sont désormais à portée de " -"clic !" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name `, theme, pages, " +"menus, :doc:`languages `, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages `." msgstr "" -"Chaque site web peut fonctionner de façon complètement indépendante, avec " -"son propre thème, logo, nom de domaine, en-tête & pied de page, pages, " -"langues, produits, blogs, forums, diapositives, événements, canaux de live " -"chat, etc. Voyons ça de plus près !" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Configuration" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -"Pour créer un nouveau site web, allez à :menuselection:`Site Web --> " -"Configuration --> Paramètres`. Le bouton *Créer un nouveau site web* se " -"trouve dans la première section." -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "" +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -"Sur la fenêtre qui apparaît, définissez un nom ainsi qu'un nom de domaine " -"pour votre nouveau site web. Si vous souhaitez publier le nouveau site sous " -"le domaine par défaut de votre base de données Odoo, laissez ce champ vide. " -"Vous pouvez définir ultérieurement des groupes de pays pour rediriger les " -"visiteurs à ce site en utilisant GeoIP." #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -"Sélectionnez ensuite un thème. Ce nouveau site web pourrait avoir un " -"objectif ou une audience totalement différents du premier site. Alors, " -"n'hésitez pas à choisir un thème différent !" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 -msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 +msgid "" +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -"Une fois le thème sélectionné, vous pouvez commencer à construire la page " -"d'accueil de votre site web. Suivez les gouttes mauves, ils vous aideront à " -"démarrer." #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -"Si vous utilisez Odoo Online, n'oubliez pas de rediriger tout nouveau nom de" -" domaine vers votre base de données Odoo (``CNAME``) et de l'autoriser côté " -"Odoo. Voir :ref:`domain-name/existing`." -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" -msgstr "Création du menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -"Le nouveau site web possède un menu par défaut qui contient toutes les " -"applications installées. Pour l'éditer, cliquez sur :menuselection:`Pages " -"--> Éditer le menu`. Si vous continuez, vous n'éditerez que le menu du site " -"web en cours." -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "Passer d'un site web à un autre" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -"Aussi simple que compter jusqu'à trois ! Dans le coin droit de la barre " -"d'édition, il y a un onglet de changement de site web. Si vous choisissez un" -" autre site, vous serez connecté au domaine de ce site. Si vous utilisez un " -"domaine différent, l'utilisateur devra se connecter." -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -"Lors du changement, vous êtes redirigé vers le chemin de domaine " -"correspondant de l'autre site web (par ex. ``/shop/myproduct``). Si cette " -"URL n'existe pas, vous serez redirigé vers une page 404, mais invité à créer" -" une nouvelle page à partir de là." -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Ajouter des fonctionnalités" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -"Les applications de site web que vous avez installées (par ex. diapositives," -" blogs) sont disponibles sur tous vos sites web. Vous pouvez bien sûr les " -"masquer sur l'un de vos sites web en supprimant cette rubrique." -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -"Chaque site web contient une large gamme d'options spécifiques dans les " -"paramètres. Pour les configurer, sélectionnez d'abord le site web." -#: ../../content/applications/websites/website/configuration/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." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" -"Jetez ensuite un coup d’œil aux options identifiées par une icône globe. " -"Cela signifie qu'elles impactent uniquement le site web sur lequel vous " -"travaillez." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "Vous pouvez, par exemple, définir :" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," -msgstr "les langues," #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," -msgstr "les noms de domaine," +msgid "Records and features can be made available:" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," -msgstr "les liens vers les réseaux sociaux," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "le mode portail client (B2C vs. B2B)," - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "les canaux dédiés de live chat," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "etc." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" -"Les autres options sont générales et s'appliquent à tous vos sites web." #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" -msgstr "Gérer les noms de domaine" - -#: ../../content/applications/websites/website/configuration/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." +msgid "Select the website on which the page is currently published." msgstr "" -"Comme expliqué précédemment, vos sites web peuvent soit partager le même nom" -" de domaine, soit utiliser un nom de domaine spécifique. Si vous le partagez" -" et souhaitez adapter le contenu par région, définissez des groupes de pays " -"dans les paramètres de chaque site web. Les visiteurs seront redirigés vers " -"le bon site web grâce à la géolocalisation IP." -#: ../../content/applications/websites/website/configuration/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" msgstr "" -"Geo IP est installé par défaut dans Odoo Online. Si vous utilisez Odoo on-" -"premise (sur vos serveurs), n'oubliez pas d'installer la bibliothèque " -"*GeoIP*. Voir :doc:`on-premise_geo-ip-installation`." -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr ":doc:`/administration/maintain/domain_names`" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 -msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website `." msgstr "" -"Si vous configurez un site web supplémentaire et vous précisez le nom de " -"domaine, vous devrez effectuer trois étapes pour que cette fonctionnalité " -"fonctionne :" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -"Configurer un enregistrement A dans la configuration DNS de votre " -"fournisseur d'hébergement pour que \"www.mywebsite2.ext\" soit redirigé vers" -" l'IP de votre instance Odoo." -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" -"Créer un bloc ``server`` Nginx supplémentaire dans lequel vous définissez le" -" ``server_name`` que vous avez défini dans le champ :guilabel:``domaine du " -"site web``." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" -"Recharger et redémarrer votre instance Nginx pour utiliser le nouveau bloc " -"``server``." +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Tarif" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "Personnaliser l'expérience des visiteurs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists `. The following configuration is " +"required:" msgstr "" -"L'expérience des visiteurs peut être personnalisée de manière très " -"approfondie grâce au menu \\*Personnaliser\\*. Toutes les options visuelles " -"disponibles dans ce menu sont spécifiques pour chaque site web. Parcourez " -"les différentes pages pour les adapter à ce nouveau public. Privilégiez les " -"flux de travail et les pages automatiques (paiement eCommerce, blogs, " -"événements, etc.) car le nombre d'options disponibles y est plus important." -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" -msgstr "Publier un contenu spécifique par site web" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Analyse" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -"Comme pour les pages statiques, tout contenu créé dans le frontend (produit," -" article de blog, etc.) est toujours publié uniquement sur le site web en " -"cours. Vous pouvez modifier cela à partir de la vue du formulaire d'édition " -"dans le backend et laisser le champ *Site Web* vide. Le contenu sera alors " -"publié sur tous les sites web." -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" -"Voici tous les éléments que vous pouvez lier à *un site en particulier ou à " -"tous les sites web* :" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "Catégories de produits pour l'eCommerce" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "Canaux de diapositives" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forums" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Événements" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Offres d'emploi" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" -"Lorsque vous publiez un enregistrement créé dans le backend, en général un " -"produit ou un événement, il devient disponible sur tous les sites web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "Publier une page sur tous les sites web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" -"Une nouvelle page statique est créée et rendue accessible uniquement sur le " -"site web en cours. Vous pouvez la dupliquer sur d'autres sites à partir de " -":menuselection:`Site Web --> Configuration --> Pages`. Pour cela, laissez le" -" champ *Site Web* vide." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" -"Si vous voulez la dupliquer sur un seul autre site web, dupliquez la page et" -" configurez le nouveau site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" -"Lorsque vous éditez à nouveau la page, la modification n'affecte que le site" -" web en cours. Une nouvelle page est dupliquée et liée au site. La page " -"d'origine reste liée à tous les sites web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" -"En regroupant les pages par URL dans le gestionnaire de pages, vous " -"retrouvez facilement la page d'origine derrière chaque page éditée." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multi-sociétés" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" -"Dans un environnement multi-sociétés, chaque site web peut être relié à une " -"société spécifique de votre système." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" -"Avec une telle configuration, seules les données relatives à la société " -"s'affichent sur le site web (produits, offres d'emploi, événements, etc.)." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" -"Les éditeurs du site web ne peuvent consulter et éditer que les pages des " -"données auxquelles ils ont accès, généralement celles appartenant à leur " -"société actuelle (ainsi qu'à leurs sociétés affiliées ou filiales dans le " -"langage Odoo). Il en va de même pour les visiteurs. " - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" -"Si les sites web sont multi-sociétés, vous ne changez pas de société lorsque" -" vous changez de site web. Pour modifier la société et voir son contenu, " -"utilisez l'onglet de sélection de société dans le menu." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "Configurer votre site web d'eCommerce" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" -"L'eCommerce est un élément essentiel de l'environnement multi-sites. Nous " -"avons fait en sorte que l'ensemble du flux puisse être personnalisé pour " -"s'adapter à tous les visiteurs de chacun des sites web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "Des produits disponibles sur un seul site web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" -"Nous avons déjà vu comment publier une donnée spécifique sur un seul site " -"web. Vous trouverez le champ \\*Site Web\\* dans l'onglet eCommerce du " -"formulaire d'édition du produit. Un champ vide veut dire qu'il est " -"disponible sur tous les sites web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "Des produits disponibles sur *certains* sites web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" -"Pour rendre un produit disponible sur certains sites web, mais pas sur tous," -" vous devez dupliquer le produit pour chaque site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" -"Si vous avez besoin d'une référence unique pour gérer votre inventaire, vous" -" devez installer *Fabrication* et créer des nomenclatures de *Kits*. Chaque " -"kit reliera chaque produit “virtuel” publié à la référence principale gérée " -"dans votre inventaire. Ainsi, tout article vendu à partir de votre site web " -"sera converti en un article stockable sur le bon de livraison." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Listes de prix" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" -"Pour gérer des prix spécifiques par site web, activez *Plusieurs prix par " -"produit* dans les paramètres de Site Web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" -"Ensuite, allez à :menuselection:`Site Web --> Produits --> Listes de prix` " -"pour créer des listes de prix supplémentaires. Vous pouvez également choisir" -" de rendre une liste de prix disponible *uniquement* sur un site web " -"spécifique." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr ":doc:`../../ecommerce/managing_products/price_management`." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" -"Si vous laissez ce champ vide, cela signifie que vous la rendez disponible " -"sur tous les sites web lorsque la case *Sélectionnable* est cochée. " -"Autrement, elle ne sera disponible que pour des opérations de vente en " -"backend ou pour des applications point de vente." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "Fournisseurs de paiement et modes de livraison" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" -"Les fournisseurs de paiement et les modes de livraison sont déployés par " -"défaut dans tous les sites web. Vous pouvez déjà utiliser des fournisseurs " -"de paiement spécifiques par pays au moyen de Geo IP en définissant des pays " -"dans leur configuration. Vous pouvez à présent le faire par site web en " -"remplissant le champ *Site web*." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" -"Dans les paramètres du Site Web vous pouvez choisir comment gérer les " -"comptes clients. Vous pouvez soit autoriser les clients à utiliser un seul " -"compte pour tous les sites, soit les obliger à créer un compte pour chaque " -"site. Cette dernière option est idéale si vous ne voulez pas que les " -"visiteurs fassent un lien entre vos différents sites web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "Des conseils techniques pour la personnalisation" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" -"Si vous souhaitez publier des éléments personnalisés sur le site web, voici " -"quelques conseils pour les faire fonctionner avec des sites web multiples :" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "Plan du site : n'oubliez pas le domaine dans le routage pour publier " - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "uniquement les données disponibles dans le plan de chaque site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "Accès : vous devez appeler la méthode" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" -"*can_access_from_current_website* dans l'unité de commande pour que le " -"visiteur puisse voir un enregistrement sur le site web en cours." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" -"Recherche : lorsqu'une liste d'enregistrements est affichée, n'oubliez pas " -"de préciser" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" -"le domaine pour uniquement afficher les enregistrements disponibles sur le " -"site web en cours." #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 msgid "Geo IP Installation (On-Premises Database)" @@ -6405,10 +6111,6 @@ msgstr "" "de la vue *Non actualisable* pour ne pas réinitialiser le fichier après les " "mises à niveau du système." -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Analyse" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "Comment contrôler le trafic de votre site web sur Google Analytics" diff --git a/locale/he/LC_MESSAGES/finance.po b/locale/he/LC_MESSAGES/finance.po index fd7ba293a..3fb6af7f8 100644 --- a/locale/he/LC_MESSAGES/finance.po +++ b/locale/he/LC_MESSAGES/finance.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: ZVI BLONDER , 2023\n" "Language-Team: Hebrew (https://app.transifex.com/odoo/teams/41243/he/)\n" @@ -552,10 +552,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -579,7 +579,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3895,6 +3895,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "תנאים מסחריים בינלאומיים" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5708,6 +5799,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7206,10 +7298,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7221,101 +7312,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message `;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter `;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter `;" +msgid ":ref:`Send an SMS message `." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "דוחות מעקב" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "דוחות מעקב" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7327,11 +7450,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7339,15 +7462,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9502,19 +9625,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade ` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install ` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code ` " "for all newly created invoice and refund transactions. Under " @@ -9524,23 +9639,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule ` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9548,7 +9651,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9560,21 +9663,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9582,24 +9685,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9607,7 +9710,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9616,39 +9719,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes ` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9659,96 +9762,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms `_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set ` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9758,73 +9838,73 @@ msgid "" ":ref:`partners `." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country `, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code `;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight `;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units `; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value `, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10165,7 +10245,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11236,7 +11316,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11411,52 +11491,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions ` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11464,46 +11525,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module ` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping `." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "דוחות" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12011,70 +12086,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "`__" @@ -12105,7 +12180,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "ידני" @@ -13471,330 +13545,919 @@ msgstr "הוצאות" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page `_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price `. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "הכנה" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense `, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses `. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries `. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15403,10 +16066,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "דוחות" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24252,7 +24911,7 @@ msgid "" "works with the following PACs: `Solución Factible " "`_, `Quadrum (formerly Finkok) " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24552,7 +25211,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum `_, `Solución Factible " "`_ and `SW Sapien - Smarter Web " -"`_." +"`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29076,7 +29735,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29299,14 +29957,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29314,7 +29972,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29388,26 +30046,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website `." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29419,7 +30087,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29429,7 +30097,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29440,36 +30108,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29481,26 +30193,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29510,21 +30222,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30327,7 +31039,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30341,183 +31053,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal " #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal `_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal `_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"`, :ref:`PDT `, and :ref:`IPN ` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"` and :ref:`Payment Data Transfer (PDT) ` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees `_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account `_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation `_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account `, then follow " "this `link Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees ` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site `_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees `_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site `_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"`_)." +"`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com `_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/he/LC_MESSAGES/inventory_and_mrp.po b/locale/he/LC_MESSAGES/inventory_and_mrp.po index d545546ff..46f2324c3 100644 --- a/locale/he/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/he/LC_MESSAGES/inventory_and_mrp.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: ZVI BLONDER , 2023\n" "Language-Team: Hebrew (https://app.transifex.com/odoo/teams/41243/he/)\n" @@ -4730,8 +4730,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4768,7 +4768,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4780,8 +4780,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4789,7 +4789,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4866,16 +4866,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4903,8 +4902,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4945,9 +4944,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/he/LC_MESSAGES/sales.po b/locale/he/LC_MESSAGES/sales.po index 9441ef87d..a6028071b 100644 --- a/locale/he/LC_MESSAGES/sales.po +++ b/locale/he/LC_MESSAGES/sales.po @@ -11,17 +11,17 @@ # Adi Sharashov , 2023 # שהאב חוסיין , 2023 # Yihya Hugirat , 2023 -# ZVI BLONDER , 2023 # Roy Sayag, 2023 +# ZVI BLONDER , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Roy Sayag, 2023\n" +"Last-Translator: ZVI BLONDER , 2023\n" "Language-Team: Hebrew (https://app.transifex.com/odoo/teams/41243/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,6 +80,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1629,8 +1630,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users ` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1639,9 +1641,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1668,41 +1670,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"`, automatically apply the :doc:`attributed " +"pricelist `, or :ref:`generate and print " +"an invoice `." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session `. For instance, to provide cleaning " @@ -1710,14 +1702,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO ` " "are displayed identically in the cart." @@ -1728,7 +1720,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1739,37 +1731,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session ` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1779,13 +1771,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1793,27 +1785,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1827,31 +1819,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2406,93 +2398,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS ` and :ref:`keep" +" track of the employees involved in each order `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings ` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge ` or selecting their name from the list of " +"allowed employees to :ref:`open the session `." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session `, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "ניתוח נתונים" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3856,21 +3865,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "חשבוניות" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3882,7 +3891,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3890,23 +3899,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3917,27 +3926,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3947,23 +3956,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3977,7 +3986,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4611,8 +4620,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access ` to the POS and :ref:`use " -"barcodes to log your employees in ` your POS." +":ref:`restrict access ` to the POS and " +":ref:`use barcodes to log your employees in ` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/he/LC_MESSAGES/websites.po b/locale/he/LC_MESSAGES/websites.po index aa5d0feca..f0cbdd518 100644 --- a/locale/he/LC_MESSAGES/websites.po +++ b/locale/he/LC_MESSAGES/websites.po @@ -4,24 +4,24 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Martin Trigaux, 2022 -# Yihya Hugirat , 2022 -# Amit Spilman , 2022 -# ExcaliberX , 2022 -# Netta Waizer, 2022 -# Lilach Gilliam , 2022 # דודי מלכה , 2022 -# ZVI BLONDER , 2022 +# Netta Waizer, 2023 +# ExcaliberX , 2023 +# Ha Ketem , 2023 +# Martin Trigaux, 2023 +# Adi Sharashov , 2023 +# ZVI BLONDER , 2023 +# Yihya Hugirat , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-04 12:47+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: ZVI BLONDER , 2022\n" -"Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n" +"Last-Translator: Yihya Hugirat , 2023\n" +"Language-Team: Hebrew (https://app.transifex.com/odoo/teams/41243/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -66,851 +66,2467 @@ msgid "" "`Odoo Tutorials: eCommerce `_" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started.rst:5 -msgid "Get started" -msgstr "התחל" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:3 -msgid "How to customize my catalog page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping.rst:5 +msgid "Checkout, payment, and shipping" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:6 -msgid "Product Catalog" -msgstr "קטלוג מוצרים" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:3 +msgid "Add to cart" +msgstr "הוסף לעגלה" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:8 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:5 msgid "" -"All your published items show up in your catalog page (or *Shop* page)." +"The :guilabel:`Add to Cart` button can be customized in multiple ways. You " +"can:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:13 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:7 msgid "" -"Most options are available in the *Customize* menu: display attributes, " -"website categories, etc." +"Choose on which page customers go after clicking the 'Add to Cart' button;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:20 -msgid "Highlight a product" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:8 +msgid "Hide the 'Add to Cart' button to prevent sales;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:22 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:9 msgid "" -"Boost the visibility of your star/promoted products: push them to top, make " -"them bigger, add a ribbon that you can edit (Sale, New, etc.). Open the Shop" -" page, switch to Edit mode and click any item to start customizing the grid." +"Add a 'Buy Now' button to skip the cart step and lead customers straight to " +"checkout;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:26 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:10 +msgid "Create additional 'Add to Cart / Buy Now' buttons;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:11 +msgid "Add an 'Order Again' button to the customer portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:14 +msgid ":doc:`checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:17 +msgid "'Add to Cart' action customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:19 msgid "" -"See how to do it: " -"https://www.odoo.com/openerp_website/static/src/video/e-commerce/editing.mp4" +"When customers click on the :guilabel:`Add to Cart` button, the product is " +"added to their cart, and customers remain **by default** on the product's " +"page. However, customers can either immediately be **redirected** to their " +"cart, or given the choice on what to do through a **dialog box**." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:29 -msgid "Quick add to cart" -msgstr "" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:31 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:23 msgid "" -"If your customers buy a lot of items at once, make their process shorter by " -"enabling purchases from the catalog page. To do so, add product description " -"and add to cart button. Turn on the following options in *Customize* menu: " -"Product Description, Add to Cart, List View (to display product description " -"better)." +"To change the default behavior, go to :menuselection:`Website --> " +"Configuration --> Settings`. Under the :guilabel:`Shop - Checkout Process` " +"section, look for :guilabel:`Add to Cart` and select one of the options." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:3 -msgid "How to build a product page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:28 +msgid "" +"If a product has :doc:`optional products " +"<../managing_products/cross_upselling>`, the **dialog box** will always " +"appear." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:5 -msgid "On the website click *New Page* in the top-right corner." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:32 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:20 +msgid ":doc:`../managing_products/catalog`" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:7 -msgid "Then click *New Product* and follow the blinking tips." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:37 +msgid "Replace 'Add to Cart' button by 'Contact Us' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:12 -msgid "Here are the main elements of the Product page:" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:39 +msgid "" +"You can replace the 'Add to Cart' button with a 'Contact Us' button which " +"redirects users to the URL of your choice." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:17 -msgid "Many elements can be made visible from the *Customize* menu." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:43 +msgid "" +"Hiding the :guilabel:`Add to Cart` button is often used by B2B eCommerces " +"that need to restrict purchases only to :ref:`customers with an account " +"`, but still want to display an online product catalog for " +"those without." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:22 -msgid "See how to configure your products from links here below." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:47 +msgid "" +"To do so, go to :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products` and tick :guilabel:`Prevent Sale of Zero Priced Product`. " +"This creates a new :guilabel:`Button url` field where you can enter the " +"**redirect URL** to be used. Then, set the price of the product to `0.00` " +"either from the **product's template**, or from a :doc:`pricelist " +"<../../../sales/sales/products_prices/prices/pricing>`." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:26 -msgid ":doc:`../managing_products/variants`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Contact us button on product page" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 -msgid ":doc:`/applications/sales/sales/products_prices/taxes`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:58 +msgid "" +"The 'Contact Us' button and '*Not Available For Sale*' text can both be " +"modified using the **website builder** on the product's page " +"(:menuselection:`Edit --> Customize`) by clicking on them." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 -msgid ":doc:`../maximizing_revenue/cross_selling`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:63 +msgid "Customizable 'Add to Cart' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:29 -msgid ":doc:`../maximizing_revenue/reviews`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:65 +msgid "" +"You can also create a customizable 'Add to Cart' button and link it to a " +"specific product. The **customized button** can be added on any page of the " +"website as an **inner content** building block, and is an *additional* " +"button to the regular :guilabel:`Add to Cart` button." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:30 -msgid ":doc:`../maximizing_revenue/pricing`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:69 +msgid "" +"To add it, go on the :guilabel:`Shop` page of your choice, click " +":menuselection:`Edit --> Blocks` and place the building block. Once placed, " +"you have the following options:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:31 -msgid ":doc:`../../website/optimize/seo`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:72 +msgid "" +":guilabel:`Product`: select the product to link the button with. Selecting a" +" product renders the :guilabel:`Action` field available;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:74 +msgid "" +":guilabel:`Action`: choose if the button should :guilabel:`Add to Cart` or " +":guilabel:`Buy Now` (instant checkout)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:84 +msgid "'Buy Now' button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:86 +msgid "" +"You can enable the 'Buy Now' button to instantly take the customer to " +"**checkout** instead of adding the product to the cart. The :guilabel:`Buy " +"Now` button is an *additional* button and does not replace the " +":guilabel:`Add to Cart` button. To enable it, go to :menuselection:`Website " +"--> Configuration --> Settings --> Shop - Checkout Process` and tick " +":guilabel:`Buy Now`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Buy Now button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:97 +msgid "Re-order from portal" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:99 +msgid "" +"Customers have the possibility to **re-order** items from **previous sales " +"orders** on the customer portal. To do so, go to :menuselection:`Website -->" +" Configuration --> Settings --> Shop - Checkout Process` and enable " +":guilabel:`Re-order From Portal`. Customers can find the :guilabel:`Order " +"Again` button on their **sales order** from the **customer portal**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Re-order button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:3 +msgid "Checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:5 +msgid "" +"You can customize the **checkout steps**, add more content using the " +"**website builder**, and enable additional features such as **express " +"checkout** and **sign in/up at checkout**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:8 +msgid "" +"You can use **building blocks** to add content at any step of the checkout " +"process. To do so, from any **checkout page**, go to :menuselection:`Edit " +"--> Blocks`, and drag and drop **building blocks** to the page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:13 +msgid "" +"Note that content added through building blocks is **specific** to each " +"step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:16 +msgid "Checkout steps" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:19 +msgid "Review order: promo code (and subtotal)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:21 +msgid "" +"If you have enabled :guilabel:`Discounts, Loyalty, & Gift Card` in the " +"settings (:menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`), you can enable the :guilabel:`Promo Code` field " +"(:menuselection:`Edit --> Customize`) from any checkout page. Customers can " +"then redeem gift cards and promotional codes at the :guilabel:`Review Order`" +" step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:26 +msgid "" +"Furthermore, you can display the subtotal with discounts applied by enabling" +" :guilabel:`Show Discount in Subtotal`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Subtotal discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:34 +msgid "Address: B2B fields" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:36 +msgid "" +"Optional :guilabel:`TIN/VAT` and :guilabel:`Company Name` fields can be " +"added to the :guilabel:`Billing Address` form for B2B customers, at the " +":guilabel:`Address` step. To add the fields, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Show B2B fields`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:42 +msgid "Request extra info (additional step)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:44 +msgid "" +"You can request :guilabel:`Extra Info` from the customer by adding an " +":guilabel:`Extra Info` step between the :guilabel:`Address` and " +":guilabel:`Confirm Order` steps. To do so, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Extra Step Option`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:53 +msgid "" +"The :guilabel:`Extra Info` step is an online form linked to the quotation or" +" sales order of the customer. The information added during that step can be " +"found on the quotation or sales order of the customer from the back end, in " +"the **Sales** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:57 +msgid "" +"When enabled, you can remove, add, and modify fields of the form by clicking" +" on :guilabel:`Edit` in the top-right corner, and then clicking on any of " +"the form's fields. All customization options, as well as the :guilabel:`+ " +"Field` button to add new fields, are available at the bottom of the " +":guilabel:`Customize` menu under the :guilabel:`Field` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Online form customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:67 +msgid "Confirm order: terms and conditions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:69 +msgid "" +"You can ask customers to agree to the :guilabel:`Terms & Conditions` in " +"order to confirm their order by enabling :guilabel:`Accept Terms & " +"Conditions` under :menuselection:`Edit --> Customize` on any checkout page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Terms and conditions" +msgstr "תנאים והגבלות" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:78 +msgid "Express checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:80 +msgid "" +"You can enable a :guilabel:`Buy Now` button on products' pages which " +"instantly takes the customer to the :guilabel:`Confirm Order` checkout page," +" instead of adding the product to the cart. To do so, go to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Checkout " +"Process section` and tick :guilabel:`Buy Now`. Alternatively, the " +":guilabel:`Buy Now` button can also be enabled from any product's page by " +"going :menuselection:`Edit --> Customize`, in the :guilabel:`Cart` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:86 +msgid "" +"The button can be found next to the :guilabel:`Add to Cart` button on the " +"product's page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Buy now (express checkout) button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:93 +msgid ":ref:`Product page design: additional functions `" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:98 +msgid "Guest and signed-in checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:100 +msgid "" +"It is possible to introduce a **checkout policy** under which customers can " +"either checkout as **guests** or **signed-in users only**. Customers can " +"also checkout as guest, and **optionally sign up later** in order to track " +"their order, if enabled." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:104 +msgid "" +"To select a policy, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shop - Checkout Process`. You can choose between:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:107 +msgid "" +":guilabel:`Optional`: allows guests to checkout and later register from the " +"**order confirmation** email to track their order;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:109 +msgid "" +":guilabel:`Disabled (buy as guest)`: customers can only checkout as guests;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:110 +msgid "" +":guilabel:`Mandatory (no guest checkout)`: customers can only checkout if " +"they have signed-in." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:113 +msgid ":doc:`../ecommerce_management/customer_accounts`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:114 +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:24 +msgid ":doc:`/applications/general/users/portal`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:117 +msgid "B2B access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:119 +msgid "" +"If you wish to restrict checkout only to **selected B2B customers**, enable " +":guilabel:`Mandatory (no guest checkout)` and go to :menuselection:`Website " +"--> eCommerce --> Customers`. Select the customer you wish to **grant access" +" to**, click :menuselection:`Action --> Grant portal access`, and click " +":guilabel:`Grant Access`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:125 +msgid "" +"Settings are **website-specific**, which means you can set up a B2C website " +"allowing **guest** checkout, and another for B2B customers with **mandatory " +"sign-in**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:129 +msgid "" +"Users can only have one portal access per **email**. They *cannot* be " +"granted access to two different portals with the same **email address**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:133 +msgid "Shared customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:135 +msgid "" +"If you enable :guilabel:`Shared Customer Accounts` under " +":menuselection:`Website --> Configuration --> Settings --> Privacy section`," +" you can allow or disallow access to *all* websites for one same account." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:3 +msgid "Payment providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:5 +msgid "" +"Odoo supports a multitude of online :doc:`payment providers " +"` for your website, allowing your " +"customers to pay with their preferred payment methods." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:10 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:55 +msgid ":doc:`/applications/sales/sales/products_prices/ewallets_giftcards`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:11 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:12 +msgid ":doc:`../checkout_payment_shipping/checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:10 +msgid "Configuration" +msgstr "תצורה" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:16 +msgid "" +"To set up payment providers on the eCommerce app, go to " +":menuselection:`Website --> Configuration --> Payment Providers`. From here," +" :guilabel:`Activate` the payment providers you wish to have available on " +"your shop, and configure them according to your needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:20 +msgid "" +"Alternatively, you can access **payment providers** via " +":menuselection:`Website --> Configuration --> Settings`. In the " +":guilabel:`Shop - Payment` section, you can :guilabel:`Configure SEPA Direct" +" Debit` if you wish to use it, as well as :guilabel:`View other providers`. " +"If you use the :guilabel:`Authorize.net` payment provider, the :ref:`Payment" +" Capture Method ` can be " +"configured in that same menu." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:27 +msgid "" +"If you are using :doc:`/applications/finance/payment_providers/paypal`, you " +"can also enable and configure it here." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:31 +msgid "Checkout payment options" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:33 +msgid "" +"Once activated, customers can choose the payment provider of their choice " +"during the **checkout process**, at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Payment provider selection at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:41 +msgid "eWallets and gift cards" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:43 +msgid "" +"When checking out, customers can pay with an eWallet or gift cards. To " +"enable these, go to :menuselection:`Website --> Configuration --> Settings`," +" and in the :guilabel:`Shop-Products` section, enable " +":menuselection:`Discounts, Loyalty & Gift Card`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:47 +msgid "" +"Once enabled, customers can enter their gift card **code** or pay with their" +" eWallet at the checkout step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Enter gift card code to process checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:3 +msgid "Shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:5 +msgid "" +"Depending on your shipping strategy, you have the choice to either use your " +":ref:`own shipping methods `, or use an integration " +"with an :ref:`existing shipping provider `." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:15 +msgid "Own shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:17 +msgid "" +"You can create your own custom shipping methods and define rules to compute " +"shipping costs. To do so, go to :menuselection:`Website --> Configuration " +"--> Shipping Methods`, and either select an **existing** shipping method, or" +" :guilabel:`Create` one. When creating a shipping method, you can choose " +"between :doc:`Fixed Price " +"`," +" :doc:`Based on Rules " +"`," +" and :guilabel:`Pickup in store`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:26 +msgid "Pickup in store" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:28 +msgid "" +":guilabel:`Pickup in store` must first be **enabled** in the settings " +"(:menuselection:`Website --> Configuration --> Settings --> Shipping " +"section)` by checking :guilabel:`On Site Payments & Picking`. Once enabled, " +"you can select and :guilabel:`Customize Pickup Sites`. :guilabel:`Picking " +"sites` can be made **website-specific**, but are by default available for " +"*all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:34 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/delivery_method`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:35 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:83 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/invoicing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:36 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:85 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/multipack`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:37 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/cancel`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:42 +msgid "Shipping providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:44 +msgid "" +"Another solution is to use one of the integrations with an existing shipping" +" provider. The advantage of using an integration is that delivery costs are " +"automatically computed based on each order as well as generating shipping " +"labels." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:49 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:50 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:51 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/dhl_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:52 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:84 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/labels`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:55 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:204 +msgid "Website availability" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:57 +msgid "" +"Shipping methods can be made available on **specific** websites *only*, if " +"desired. To do so, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shipping Methods`, and select the desired **shipping method**. " +"In the :guilabel:`Website` field, set the website you want the shipping " +"method to be restrained to. Leave the field **empty** for the method to be " +"available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:63 +msgid "Delivery method at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:65 +msgid "" +"Customers can choose the shipping method at the end of the checkout process," +" at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst-1 +msgid "Delivery method choice at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management.rst:5 +msgid "eCommerce management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 +msgid "Customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:5 +msgid "" +"Having customer accounts on an eCommerce allows customers to access all " +"their documents from a single place. To access their account, customers must" +" be **logged-in** on the eCommerce website, click on their **username** in " +"the top-right corner of the screen, and click :guilabel:`My Account`. From " +"there, customers can access their :guilabel:`quotations`, " +":guilabel:`orders`, :guilabel:`invoices`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Customer account log-in" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:16 +msgid "" +"Customers can only have an account if the :ref:`sign in/up at checkout " +"` option allows for accounts creation." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:20 +msgid "" +"Similarly to the rest of the website, the customer account page can be " +"customized with **content blocks** and other features through the **website " +"builder**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:27 +msgid "Access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:29 +msgid "" +"It is possible to allow or restrict the documents to which customers have " +"access through the website builder. Log in your **own** account with your " +"Odoo database credentials, and go to :menuselection:`Edit --> Customize`. " +"From the website builder menu, enable or disable the documents customers can" +" have access to." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Documents to which customers have access to from their account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:39 +msgid "Multi-website account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:41 +msgid "" +"If you own multiple websites, you can make customer accounts available " +"across **all** websites. Then, the customer only needs one account. To do " +"so, go to :menuselection:`Website --> Configuration --> Settings --> Privacy" +" section`, and enable :guilabel:`Shared Customer Accounts`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:3 +msgid "Customer interaction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:5 +msgid "" +"Odoo offers many ways to interact with customers and for customers to " +"interact with your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:10 +msgid "Product reviews" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:12 +msgid "" +"Customers can give a rating to your products. This is a great way to promote" +" your products or services since reviews can influence purchase processes. " +"To activate the **rating** feature, from your **shop page**, select a " +"product, go to :menuselection:`Edit --> Customize` and enable " +":guilabel:`Rating`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Rating of a product on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:22 +msgid "" +"Only portal users which purchased the product or service can leave ratings." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:25 +msgid "" +"Customer reviews can be hidden by clicking the :guilabel:`Visible` button " +"next to a published review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:29 +msgid "Live chat" +msgstr "צ'אט חי" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:31 +msgid "" +"A chatbot is available and can simulate a human-like conversation with " +"website visitors via text messages in a chat box." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:35 +msgid ":doc:`../../livechat`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:36 +msgid ":doc:`../../livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:37 +msgid ":doc:`../../livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:42 +msgid "Contact forms" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:45 +msgid "Helpdesk" +msgstr "מוקד תמיכה ללקוחות" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:47 +msgid "" +"Customers may need support after purchasing a product or subscribing to a " +"service. It is possible to create a **contact form**, which, when fulfilled," +" automatically creates a new ticket for your **support team**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Contact form to submit a ticket to the support team" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:55 +msgid "" +"To add a contact form, **create** a new page (:menuselection:`+ New --> " +"Page`) if necessary, and drag and drop a :guilabel:`Form` block from the " +":guilabel:`Dynamic Content` section onto the page. Once placed, click on the" +" form (while in :guilabel:`Edit` mode), and in the :guilabel:`Action` field," +" select :guilabel:`Create a Ticket`. You can then select to which " +":guilabel:`Helpdesk team` the ticket should be assigned." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Action field to create a task upon submitting a form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:66 +msgid "Contact us" +msgstr "צור קשר" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:68 +msgid "" +"A 'Contact Us' page makes it easier for customers and prospects to contact " +"your company and get in touch." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:71 +msgid "" +"To have a 'Contact Us' page, create a new page (:menuselection:`+ New --> " +"Page`) if necessary, and click on :menuselection:`Edit --> Customize`. Then," +" drag and drop a :guilabel:`Form` block onto the page. Select the form and " +"define the action to be performed when submitted in the :guilabel:`Action` " +"field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:76 +msgid "" +"When clicking on a field, or when adding a new field (:guilabel:`+ Field`), " +"you can select its :guilabel:`Type`. This enables different options, such as" +" :guilabel:`Multiple Checkboxes`, which customers can use to indicate the " +"services they are interested in, for example." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Tags to be selected on the 'Contact Us' form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "'Checkboxes' configuration settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:89 +msgid "Newsletter" +msgstr "דיוור" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:91 +msgid "" +"Customers can get updates on your eCommerce activities by subscribing to a " +"newsletter. Visitors subscribing to the newsletter are automatically added " +"to the mailing list of the **Email Marketing** application. You can either " +"choose a newsletter **block**, a newsletter **popup**, or both." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:95 +msgid "" +"**Popup**: prompts up a newsletter box when visitors scroll down the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:96 +msgid "" +"**Block**: displays a field on the page where customers can sign up by " +"entering their email." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:98 +msgid "" +"The newsletter **block** can be configured according to different " +":guilabel:`Templates`. To do so, click the **block** while in " +":menuselection:`Edit --> Customize`, and select a :guilabel:`Template` in " +"the :guilabel:`Newsletter Block` section. There are **three** templates " +"available:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:102 +msgid "" +":guilabel:`Email Subscription`: visitors can sign up by email to the " +"newsletter, without any choice to the content. The content is defined in " +":menuselection:`Edit --> Customize` in the :guilabel:`Newsletter` field;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:105 +msgid "" +":guilabel:`SMS Subscription`: is the same as :guilabel:`Email Subscription`," +" but by SMS;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:106 +msgid "" +":guilabel:`Form Subscription`: allows adding several fields, as well as a " +"checkbox for the visitor to agree to the **GDPR policy** of your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Form subscription configuration and settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:114 +msgid "" +"Alternatively, you can select :guilabel:`Subscribe to Newsletter` as " +":guilabel:`Action` when creating a :ref:`contact form `, " +"allowing for the same level of customization. Make sure to add a checkbox " +"stating visitors agree to be added to the mailing list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:3 +msgid "Order handling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:5 +msgid "" +"When a customer orders on your eCommerce, there are **three** record types " +"required to be handle in Odoo:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:8 +msgid ":ref:`Sales orders `;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:9 +msgid ":ref:`Delivery orders `;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:10 +msgid ":ref:`Invoices & legal requirements `." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:15 +msgid "Sales orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:18 +msgid "Order and payment status" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:20 +msgid "" +"The first step when a customer adds a product to his cart is the creation of" +" a quotation. Orders can be managed either from the **Website** or " +":doc:`Sales ` app. eCommerce orders can " +"automatically be assigned to a specific sales team by going to " +":menuselection:`Website --> Configuration --> Settings`. In the **Shop - " +"Checkout Process** section, select a :guilabel:`Sales Team` or " +":guilabel:`Salesperson` to handle eCommerce orders." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Assignment of online orders to a sales team or salesperson" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:30 +msgid "" +"Orders can be found under :menuselection:`Website --> eCommerce --> " +"Orders/Unpaid Orders`. Each order goes through a different status:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:33 +msgid "" +"**Quotation**: a new product is added to the cart, but the customer has " +"*not* gone through the checkout process yet;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:35 +msgid "" +"**Quotation sent**: the customer has gone through the checkout process and " +"confirmed the order, but the payment is not yet confirmed;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:37 +msgid "" +"**Order**: the customer has gone through the checkout process, confirmed the" +" order, and the payment is received." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Statuses of eCommerce orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:45 +msgid "Abandoned cart" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:47 +msgid "" +"An **abandoned cart** represents an order for which the customer did **not " +"finish** the checkout confirmation process. For these orders, it is possible" +" to send an **email reminder** to the customer automatically. To enable that" +" feature, go to :menuselection:`Website --> Configuration --> Settings` and " +"in the :guilabel:`Email & Marketing` section, enable " +":guilabel:`Automatically send abandoned checkout emails`. Once enabled, you " +"can set the **time-lapse** after which the email is sent and customize the " +"**email template** used." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:55 +msgid "" +"For abandoned cart emails, the customer must either have entered their " +"contact details during the checkout process; or be logged-in when they added" +" the product to their cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:61 +msgid "Delivery orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:64 +msgid "Delivery flow" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:66 +msgid "" +"Once a quotation has been confirmed, a delivery order is automatically " +"created. The next step is to process this delivery." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:69 +msgid "" +"Packing eCommerce orders usually requires picking the product, preparing the" +" packaging, printing the shipping label(s) and shipping to the customer. " +"Depending on the number of orders, strategy, or resources, those steps can " +"be considered as one or multiple actions in Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:73 +msgid "" +"An automatic email can be sent to the customer when the transfer status in " +"Odoo is “done”. To do so, enable the feature in the settings of the " +":doc:`Inventory ` app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:78 +msgid "" +"If customers are allowed to pay when picking up their order in stores or by " +"wire transfer, the quotation is **not** be confirmed and the stock is " +"**not** be reserved. Orders must be confirmed manually to reserve products " +"in stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:88 +msgid "Returns and refunds" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:90 +msgid "" +"Customers can only return an order through an online form. It may not be " +"possible to return products depending on the return strategy or type of " +"product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:93 +msgid "" +"Full refunds can be directly sent to customers from within the order " +"interface. A refund-compatible payment provider needs to be enabled first." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:97 +msgid ":doc:`/applications/sales/sales/products_prices/returns`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:98 +msgid ":doc:`/applications/services/helpdesk/advanced/after_sales`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:99 +msgid ":doc:`/applications/finance/payment_providers`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:104 +msgid "Invoice and legal requirements" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:106 +msgid "" +"The final step of an ecommerce order is to generate the invoice and send it " +"to the customer. Depending on the type of business (B2B or B2C), an invoice " +"can either be generated automatically (B2B) or on demand of the customer " +"(B2C). This process can be automated if (and when) the online payment is " +":ref:`confirmed `." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:111 +msgid "" +"To automate invoicing, go to :menuselection:`Website --> Configuration --> " +"Settings` and in the :guilabel:`Invoicing` section, enable " +":guilabel:`Automatic Invoice`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:3 +msgid "Performance monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:5 +msgid "" +"Odoo integrates a variety of tools to analyze and improve the performance of" +" your eCommerce website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:9 +msgid "Performance analysis tools" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:12 +msgid "Data monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:14 +msgid "" +"**Website** allows monitoring and analysis of the sales performance of your " +"eCommerce. To access the **reporting view**, go to :menuselection:`Website " +"--> Reporting`. This dashboard helps you monitor everything related to " +"sales, such as sales performance per product, category, day, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst-1 +msgid "Performance reporting of eCommerce" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:22 +msgid "" +"By clicking :guilabel:`Measures`, you can select the type of measurement " +"used, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:24 +msgid ":guilabel:`Margin`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:25 +msgid ":guilabel:`Qty Invoiced`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:26 +msgid ":guilabel:`Untaxed Total`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:27 +msgid ":guilabel:`Volume`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:28 +msgid "..." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:30 +msgid "" +"Other options include **multiple views (Pivot, etc.), comparison** by " +"periods or years, and directly :guilabel:`insert in spreadsheet`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 +msgid "Analytics" +msgstr "ניתוח נתונים" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:36 +msgid "" +"It is possible to link your Odoo website with Google Analytics. To do so, go" +" to :menuselection:`Website --> Configuration --> Settings` and scroll to " +"the :guilabel:`SEO` section. Then, enter your **ID** in the " +":guilabel:`Measurement ID` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:40 +msgid "" +"If you are still using **Universal Analytics**, it can directly be added by " +"injecting the code in the HTML header and body using the website builder. " +"All metrics from Google Analytics and Universal Analytics can be seen " +"directly within Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:44 +msgid "" +"Alternatively, Odoo offers the possibility to use another service, " +"**Plausible.io**. Plausible.io is a simple and privacy-friendly alternative " +"to Google Analytics. Everything can be managed directly in Odoo, there is no" +" need to visit Plausible.io's website to access your metrics." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:49 +msgid ":doc:`/applications/websites/website/reporting/google_analytics`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:50 +msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -msgid "Manage my products" +msgid "Products" +msgstr "מוצרים" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:3 +msgid "Catalog" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:3 -msgid "How to display several images per product" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:5 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:5 msgid "" -"By default your product web page displays the main image of your product " -"only. If you like to show your products under several angles, you can turn " -"the image into a carrousel." +"The eCommerce catalog is the equivalent of your physical store shelves: it " +"allows customers to see what you have to offer. Clear categories, available " +"options, sorting, and navigation threads help you structure it efficiently." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:11 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:10 +msgid "Categorize the product catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:12 msgid "" -"Check *Several images per product* in :menuselection:`Website Admin --> " -"Configuration --> Settings`." +"In Odoo, there is a **specific category model** for your eCommerce. Using " +"eCommerce categories for your products allows you to add a navigation menu " +"on your eCommerce page. Visitors can then use it to view all products under " +"the category they select." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:13 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:16 msgid "" -"Open a product detail form and upload images from *Images* tab. Hit *Create*" -" in Edit mode to get the upload wizard." +"To do so, go to :menuselection:`Website --> eCommerce --> Products`, select " +"the product you wish to modify, click on the :guilabel:`Sales` tab, and " +"select the :guilabel:`Categories` you want under :guilabel:`eCommerce Shop`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:19 -msgid "Such extra image are common to all the product variants (if any)." +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "eCommerce categories under the \"Sales\" tab" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:25 +msgid "A single product can appear under multiple eCommerce categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:27 +msgid "" +"When your product's categories are configured, go to your **main shop page**" +" and click on :menuselection:`Edit --> Customize tab`. In the " +":guilabel:`Categories` option, you can either enable a menu on the " +":guilabel:`Left`, on the :guilabel:`Top`, or both. If you select the " +":guilabel:`Left` category, the option :guilabel:`Collapsable Category " +"Recursive` appears and allows to render the :guilabel:`Left` category menu " +"collapsable." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Categories options for your eCommerce website" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:38 +msgid ":doc:`products`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:43 +msgid "Browsing" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:45 +msgid "" +"The eCommerce category is the first tool to organize and split your " +"products. However, if you need an extra level of categorization in your " +"catalog, you can activate various **filters** such as attributes or sort-by " +"search." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:50 +msgid "Attributes" +msgstr "תכונות" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:52 +msgid "" +"Attributes refer to **characteristics** of a product, such as **color** or " +"**material**, whereas variants are the different combinations of attributes." +" :guilabel:`Attributes and Variants` can be found under " +":menuselection:`Website --> eCommerce --> Products`, select your product, " +"and :guilabel:`Attributes & Variants` tab." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:58 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:15 +msgid ":doc:`../../../sales/sales/products_prices/products/variants`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Attributes and variants of your product" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:64 +msgid "" +"To enable **attribute filtering**, go to your **main shop page**, click on " +":menuselection:`Edit --> Customize tab` and select either :guilabel:`Left`, " +":guilabel:`Top`, or both. Additionally, you can also enable :guilabel:`Price" +" Filtering` to enable price filters." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:69 +msgid "" +":guilabel:`Price Filter` works independently from **attributes** and, " +"therefore, can be enabled on its own if desired." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:73 +msgid "" +"You can use **attribute filters** even if you do not work with product " +"variants. When adding attributes to your products, make sure only to specify" +" *one* value per attribute. Odoo does not create variants if no combination " +"is possible." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:78 +msgid "Sort-by search" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:80 +msgid "" +"It is possible to allow the user to manually **sort the catalog** using the " +"search bar. From your **main shop page**, click on :menuselection:`Edit --> " +"Customize tab`; you can enable or disable the :guilabel:`Sort-By` option as " +"well as the :guilabel:`Layout` button. You can also select the " +":guilabel:`Default Sort` of the :guilabel:`Sort-By` button. The default sort" +" applies to *all* categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:86 +msgid "The **sorting** options are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:88 +msgid "Featured" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:89 +msgid "Newest Arrivals" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:90 +msgid "Name (A-Z)" +msgstr "שם (א-ת)" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:91 +msgid "Price - Low to High" +msgstr "מחיר - נמוך לגבוה" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:92 +msgid "Price - High to Low" +msgstr "מחיר - גבוה לנמוך" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:94 +msgid "" +"In addition, you can **manually edit** the catalog's order of a product by " +"going to **the main shop page** and clicking on the product. Under the " +":guilabel:`Product` section of the :guilabel:`Customize` section, you can " +"rearrange the order by clicking on the arrows. `<<` `>>` move the product to" +" the **extreme** right or left, and `<` `>` move the product by **one** row " +"to the right or left. It is also possible to change the catalog's order of " +"products in :menuselection:`Website --> eCommerce --> Products` and drag-" +"and-dropping the products within the list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Product rearrangement in the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:107 +msgid "Page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:110 +msgid "Category page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:112 +msgid "" +"You can customize the layout of the category page using the website builder." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:115 +msgid "" +"Editing the layout of the category page is global; editing one category " +"layout affects *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:118 +msgid "" +"To do so, go on to your :menuselection:`Category page --> Edit --> " +"Customize`. Here, you can choose the layout, the number of columns to " +"display the products, etc. The :guilabel:`Product Description` button makes " +"the product description visible from the category page, underneath the " +"product picture." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Layout options of the category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:127 +msgid "" +"You can choose the size of the grid, but be aware that displaying too many " +"products may affect performance and page loading speed." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:131 +msgid "Product highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:133 +msgid "" +"You can highlight products to make them more visible on the category or " +"product page. On the page of your choice, go to :menuselection:`Edit --> " +"Customize` and click on the product to highlight. In the :guilabel:`Product`" +" section, you can choose the size of the product image by clicking on the " +"grid, and you can also add a **ribbon** or :guilabel:`Badge`. This displays " +"a banner across the product's image, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:139 +msgid "Sale;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:140 +msgid "Sold out;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:141 +msgid "Out of stock;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:142 +msgid "New." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:144 +msgid "" +"Alternatively, you can activate the :doc:`developer mode " +"<../../../general/developer_mode>` on the **product's template**, and under " +"the :guilabel:`Sales` tab, change or create the ribbon from the " +":guilabel:`Ribbon` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:149 +msgid "" +"The :doc:`developer mode <../../../general/developer_mode>` is only intended" +" for experienced users who wish to have access to advanced tools. Using the " +"**developer mode** is *not* recommended for regular users." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Ribbon highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:158 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:160 +msgid "" +"You can access and enable additional feature buttons such as **add to " +"cart**, **comparison list**, or a **wishlist**. To do so, go to your **main " +"shop page**, and at the end of the :guilabel:`Products Page` category, click" +" on the feature buttons you wish to use. All three buttons appear when " +"hovering the mouse over a product's image." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:165 +msgid "" +":guilabel:`Add to Cart`: adds a button to :doc:`add the product to the cart " +"<../checkout_payment_shipping/cart>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:167 +msgid "" +":guilabel:`Comparison List`: adds a button to **compare** products based on " +"their price, variant, etc.;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:169 +msgid "" +":guilabel:`Wishlist Button`: adds a button to **wishlist** the product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Feature buttons for add to cart, comparison list, and wishlist" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Appearance of buttons when hoovering over the mouse" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:180 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:112 +msgid "Add content" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:182 +msgid "" +"You can use **building blocks** to add content on the category page, with a " +"variety of blocks ranging from :guilabel:`Structure` to :guilabel:`Dynamic " +"Content`. Specific areas are defined to use blocks are defined and " +"highlighted on the page when **dragging-and-dropping** a block." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Building blocks areas" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:190 +msgid "" +"If you drop a building block **on top** of the product list, it creates a " +"new category header specific to *that* category." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:192 +msgid "" +"If you drop a building **on the top** or **bottom** of the page, it becomes " +"visible on *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:196 +msgid "" +"Adding content to an eCommerce category page is beneficial in terms of " +"**SEO** strategy. Using **keywords** linked to the products or the eCommerce" +" categories improves organic traffic. Additionally, each category has its " +"own specific URL that can be pointed to and is indexed by search engines." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:3 +msgid "Cross-selling and upselling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:5 +msgid "" +"Any sales process is an opportunity to maximize revenues. **Cross-selling " +"and upselling** are sales techniques consisting in selling customers " +"additional or more expensive products and services than what they were " +"originally shopping for. It is a great way to maximize the value of each one" +" of your customers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:10 +msgid "**Cross-selling** can be done via **two** features:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:12 +msgid "" +":ref:`Optional products ` upon **adding to cart**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:13 +msgid "" +":ref:`Accessory products ` on the **checkout " +"page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:15 +msgid "" +"**Upselling** is only done via :ref:`alternative products " +"` on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:19 +msgid ":doc:`catalog`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:22 +msgid "Cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:27 +msgid "Optional products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:29 +msgid "" +"**Optional products** are suggested when customers click :guilabel:`Add to " +"cart`, either from the **product page** or **catalog page**. Upon clicking, " +"a pop-up window opens with the **optional products** displayed in the " +":guilabel:`Available Options` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Optional products cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:37 +msgid "" +"To enable **optional products** go to :menuselection:`Website --> eCommerce " +"--> Products`, select a product, go to the :guilabel:`Sales` tab, and enter " +"the products you wish to feature in the :guilabel:`Optional Products` field." +" Optional products are **linked** to the product(s) they are set up with on " +"the **product template**. They only appear when that product is added to the" +" cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:43 +msgid "" +"You can also access the :guilabel:`Sales` tab of the **product template** by" +" selecting a product on your **main shop page** and clicking " +":guilabel:`Product` in the top-right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:49 +msgid "Accessory products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:51 +msgid "" +"**Accessory products** are displayed in the :guilabel:`Suggested " +"Accessories` section before processing to checkout at the :guilabel:`Review " +"Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Suggested accessories at checkout during cart review" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:58 +msgid "" +"To enable **accessory products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Accessory " +"Products` field. Suggested accessory products are **linked** to the " +"product(s) they are set up with on the **product template**. They only " +"appear when that product is at the checkout process review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:65 +msgid "Upselling" +msgstr "מקדמות" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:70 +msgid "Alternative products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:72 +msgid "" +"**Alternative products** are suggested on the **product page** and usually " +"incentivize customers to buy a more expensive variant or product than the " +"one they were initially shopping for." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Alternative products on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:79 +msgid "" +"To enable **alternative products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Alternative " +"Products` field. Then, go to the related **product page** by clicking " +":guilabel:`Go To Website`, and click :menuselection:`Edit`. Stay on the " +":guilabel:`Blocks` tab, and scroll down to the :guilabel:`Dynamic Content` " +"section. Then, drag and drop the :guilabel:`Products` building block " +"anywhere on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:86 +msgid "" +"When placed, in :guilabel:`Edit` mode, click the **block** to access various" +" settings for that :guilabel:`Products` building block. In the " +":guilabel:`Filter` field, select :guilabel:`Alternative Products`. You can " +"configure several additional settings, such as how many elements are " +"displayed (:guilabel:`Fetched Elements`), the :guilabel:`Template` used, " +"etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:3 +msgid "Price management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:5 +msgid "" +"Odoo offers multiple options to select the price displayed on your website, " +"as well as condition-specific prices based on set criteria." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:9 +msgid "Taxes" +msgstr "מיסים" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:12 +msgid "Tax configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:14 +msgid "" +"To add a tax on a product, you can either set a tax in the " +":guilabel:`Customer Taxes` field of the **product template** or use " +":doc:`fiscal positions " +"`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 +msgid ":doc:`/applications/finance/accounting/taxes`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 +msgid "Tax display" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:27 +msgid "" +"Choosing the displayed price tax usually depends on a country's regulations " +"or the type of customers **(B2B vs. B2C)**. To select the type of price " +"displayed, go to :menuselection:`Website --> Configuration --> Settings`, " +"scroll down to the :guilabel:`Shop - Products` category, and select " +":guilabel:`Tax Excluded` or :guilabel:`Tax Included`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:32 +msgid "" +":guilabel:`Tax Excluded`: the price displayed on the website is **tax-" +"excluded**, and the tax is computed at the cart-review step;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:34 +msgid "" +":guilabel:`Tax Included`: the price displayed on the website is **tax-" +"included**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:37 +msgid "" +"This setting is **global**, and the tax-display type is the same for (all " +"of) your website(s). It is, therefore, not possible to select different tax " +"displays for different websites. This may be a significant point of " +"consideration when implementing a database with multiple ecommerce websites " +"aimed at varying customer types (i.e., B2B and B2C)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:42 +msgid "" +"You can choose to display the type of pricing next to the product price by " +"going to :menuselection:`Website --> Site --> Homepage --> Shop`, selecting " +"a product, and then :menuselection:`Edit --> Customize tab` and enabling " +":guilabel:`Tax Indication`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Tax type displayed on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 +msgid "Price per unit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:56 +msgid "" +"It is possible to display a :doc:`price per unit " +"` on the " +"product page. To do that, go to :menuselection:`Website --> Configuration " +"--> Settings` and enable :guilabel:`Product Reference Price` under the " +":guilabel:`Shop - Products` section. When enabled, ensure an amount is set " +"in the :guilabel:`Base Unit Count` field of the **product template**, and in" +" the :guilabel:`Sales Price`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product template" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:67 +msgid "" +"The price per unit of measure can be found above the :guilabel:`Add to Cart`" +" button on the product page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:75 +msgid "" +"Pay attention that having the price per unit may be **mandatory** in some " +"countries." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:78 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +msgid "Price configuration: pricelists" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 +msgid "" +"Pricelists are the primary tool to manage prices on your eCommerce. They " +"allow you to define website-specific prices - different from the price on " +"the product template - based on the **country group**, **currency**, " +"**minimum quantity**, **period**, or **variant**. You can create as many " +"pricelists as needed, but it is mandatory to have at least one pricelist " +"configured per website. If no custom pricelists are added, Odoo defaults to " +"the **Public Pricelist** for all websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 +msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 +msgid "" +"Pricelists can be found under :menuselection:`Website --> eCommerce --> " +"Pricelists`, but must first be activated. For that, head to " +":menuselection:`Website --> Configuration --> Settings` and scroll down to " +"the :guilabel:`Shop - Products` section. There, you can find two options:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 +msgid ":guilabel:`Multiple prices per product`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +msgid ":guilabel:`Advanced price rules (discounts, formulas)`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 +msgid "" +"The **first** option allows you to set different prices per customer " +"*segment*, i.e., registered customers, gold customers, regular customers, " +"etc. The **second** option allows you to set *price change* rules such as " +"**discounts**, **margins**, **roundings**, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +msgid "Foreign currency" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 +msgid "" +"If you are selling in **multiple currencies** and have pricelists in foreign" +" currencies, customers can select their corresponding pricelist anywhere on " +"the :guilabel:`Shop` page from the drop-down menu next to the **search " +"bar**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Pricelists selection" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 +msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +msgid "Permanent discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 +msgid "" +"If you have permanently reduced the price of a product, a popular means to " +"attract customers is the **strikethrough** strategy. The strategy consists " +"in displaying the previous price crossed out and the **new discounted " +"price** next to it." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Price strikethrough" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 +msgid "" +"To display a 'striked' price, enable the :guilabel:`Comparison Price` option" +" under :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products category`. Then, head to the product's template " +"(:menuselection:`Website --> eCommerce --> Products`), and in the " +":guilabel:`Compare to Price` field, enter the **new** price." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:3 +msgid "Product management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:5 +msgid "" +"Odoo allows you to create, import, and manage your products' pages all " +"within the **Website** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:8 +msgid "Add products to the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:10 +msgid "To add a product to your catalog, you can either do it in:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:12 +msgid "" +"From anywhere on your website, click :menuselection:`+ New --> Product`. " +"Enter the name of your product, and :guilabel:`Save`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:14 +msgid ":menuselection:`Website --> eCommerce --> Products --> Create`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:15 +msgid "" +"or by :ref:`importing data ` using XLSX or CSV files. To do so," +" go to :menuselection:`Website --> eCommerce --> Products`. Click on " +":guilabel:`Favorites` and :ref:`Import records `." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:21 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 +msgid ":doc:`../../../sales/sales/products_prices/products/import`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:22 +msgid ":doc:`Product-related documentation <../../../sales/sales>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:25 +msgid "Publish" +msgstr "פרסם" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:27 +msgid "" +"Upon creation, products are defaulted as :guilabel:`Unpublished` in your " +"eCommerce catalog. To make a product visible to visitors, go to " +":menuselection:`Website --> Site --> Homepage`, click on your **main shop** " +"page, select the product, and enable it as :guilabel:`Published` in the top-" +"right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:33 +msgid "" +"To publish **large batches** of products, the most convenient fashion is to " +"go to :menuselection:`Website --> eCommerce --> Products`. Here, remove the " +":guilabel:`Published` filter by clicking on the :guilabel:`x` right to it, " +"and then select the :guilabel:`List` view. Next, click the " +":guilabel:`dropdown toggle` button (located right below the :guilabel:`List`" +" button) and enable :guilabel:`Is published`. Click the :guilabel:`Is " +"Published` column to re-order it either by **published** or **unpublished** " +"products. Finally, select the products to publish by ticking their box on " +"the extreme-right, and tick any box of the selected products in the " +":guilabel:`Is Published` column to publish them all." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "List and dropdown toggle buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:47 +msgid "Product page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:49 +msgid "" +"Once a product is created, you can access its **product page** through the " +":guilabel:`Shop` page by clicking on the product, and then clicking " +":guilabel:`Edit`. Here, you can change the page's **additional functions**, " +"**layout**, **add content**, etc. Note that **enabled functions** apply to " +"*all* product pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:57 +msgid "Additional functions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:59 +msgid "" +"In the **website builder** window, click :guilabel:`Customize` to enable " +"additional functions:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:61 +msgid "" +":guilabel:`Customers: Rating` allows customers to submit :ref:`product " +"reviews `; :guilabel:`Share` adds social media and email " +"icon buttons to share the product via those channels;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:64 +msgid "" +":guilabel:`Select Quantity`: if enabled, allows to choose the quantity added" +" to cart;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:65 +msgid "" +":guilabel:`Tax Indication`: notifies if the price is **VAT included** or " +"**excluded**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:66 +msgid "" +":guilabel:`Variants`: shows all possible :doc:`variants " +"` of the " +"product as a :guilabel:`Products List`; :guilabel:`Options` as selectable " +"options to compose the variant yourself;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:70 +msgid "" +":guilabel:`Cart`: :guilabel:`Buy Now` adds a :ref:`checkout button " +"` taking the customer directly to the checkout page; " +":guilabel:`Wishlist` allows to add the product to a wishlist;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:73 +msgid "" +":guilabel:`Specification`: allows you to select where the " +":guilabel:`Specifications` section is displayed. This option displays a list" +" of all variant attributes and values of a product, but only works for " +"products *with* variants." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:78 +msgid "" +"To allow **wishlists**, the option must be enabled in " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:80 +msgid "" +"To access the :guilabel:`Variants` options, the :doc:`Product Variants " +"<../../../sales/sales/products_prices/products/variants>` option must first " +"be enabled under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:85 +msgid "Layout" +msgstr "עיצוב" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:87 +msgid "" +"Within the same :guilabel:`Customize` tab as the :ref:`functions `, the layout configuration can be changed according to your " +"needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:90 +msgid "" +":guilabel:`Images Width`: changes the width of the product images displayed " +"on the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:91 +msgid "" +":guilabel:`Layout`: the :guilabel:`Carousel` layout displays a large, main " +"image with smaller ones underneath; whereas the :guilabel:`Grid` displays " +"four images in a square layout (see pictures below);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:94 +msgid "" +":guilabel:`Image Zoom`: choose which image zooms are available, either " +":guilabel:`Pop-up on Click`, when hovering over the image " +"(:guilabel:`Magnifier on hover`), on :guilabel:`Both`, or :guilabel:`None`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:97 +msgid "" +":guilabel:`Thumbnails`: decide how the thumbnails should be aligned, either " +"**vertically** (:guilabel:`Left`), or **horizontally** (:guilabel:`Right`);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:99 +msgid "" +":guilabel:`Main Image`: click :guilabel:`Replace` to change the product's " +"main image;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:100 +msgid "" +":guilabel:`Extra Images`: click :guilabel:`Add` or :guilabel:`Remove all` to" +" add or remove extra product images. You can also add images and videos via " +"**URL**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:104 +msgid "" +"Images must either be in PNG or JPG format. To trigger the zoom, the image " +"has to be bigger than 1024x1024." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product images layout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:114 +msgid "" +"You can use **building blocks** (:menuselection:`Edit --> Blocks`) to add " +"content to your product page. These blocks can be used to add extra text and" +" picture galleries, features such as :guilabel:`Call to Actions`, " +":guilabel:`Comparisons`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:118 +msgid "" +"Depending on *where* you drop the **building block**, it may be available " +"either on the product page *only*, or on the *whole* website. **Building " +"blocks** dropped at the very top or very bottom of the page are available on" +" the *whole* website, where **building blocks** put underneath the product " +"description are only displayed on the *product* page *(see image below)*." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Building blocks on product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:128 +msgid "Download link" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:130 +msgid "" +"To add a downloadable file (ex.: user's manual, notice of use, etc.) on the " +"product page, drag and drop a :guilabel:`Text` block from " +":menuselection:`Edit --> Blocks` on the page. Once placed, click within the " +":guilabel:`Text` block, and under the :guilabel:`Inline Text` section, " +"select either :menuselection:`Insert Media --> Documents` or " +":guilabel:`Insert or edit link` and enter the URL in the :guilabel:`Your " +"URL` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:137 +msgid "" +"The difference with :ref:`digital files ` is that " +"digital files can only be downloaded *after* checkout." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Media and link buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:147 +msgid "Digital files" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:149 +msgid "" +"Should your product be sold with a certificate, manual user, or any other " +"relevant document, it is possible to add a download link for customers at " +"the end of the checkout. To do that, first enable :guilabel:`Digital " +"Content` under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Checkout Process`. Then, on the **product's template**, click on " +":menuselection:`More --> Digital Files` and :guilabel:`Create` a new file." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Digital Files menu" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:159 +msgid "For the configuration:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:161 +msgid ":guilabel:`Name`: the name of your file;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:162 +msgid "" +":guilabel:`Type:` select if it is either a **file** or a **URL**. " +"Accordingly, you either have a :guilabel:`File Content (base64)` field to " +"upload your file, or a :guilabel:`URL` field to enter your URL." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:165 +msgid "" +":guilabel:`Website`: the website on which that file is *available*. If you " +"want it available for *all* websites, leave it empty." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:168 +msgid "" +"The file is then available after checkout in the **purchase order** section " +"found on the customer's portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:172 +msgid "Product configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:175 +msgid "Multiple languages" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:177 +msgid "" +"If multiple languages are available on your website and you wish to have the" +" product's information translated, it is necessary to encode this translated" +" information in the **product's template**. Fields with multiple languages " +"available are identifiable by their abbreviation language (ex. :abbr:`EN " +"(English)`) next to their field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Field translation" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:186 +msgid "The **eCommerce-related** fields to translate are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:188 +msgid ":guilabel:`Product name`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:189 +msgid ":guilabel:`Out-of-Stock Message` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:190 +msgid ":guilabel:`Sales Description` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:193 +msgid "" +"Having untranslated content on a web page may be detrimental to the user " +"experience and :doc:`SEO <../../../websites/website/pages/seo>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:196 +msgid "" +"To check the language(s) of your website, go to :menuselection:`Website --> " +"Configuration --> Settings --> Website Info section`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:200 +msgid ":doc:`../../../websites/website/pages/seo`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:201 +msgid ":ref:`Multi-language support `" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:206 +msgid "" +"A product can be set available on either *one* or *all* websites, but it is " +"not possible to select *some* websites and not others. To define a product's" +" availability, go to :menuselection:`Website --> eCommerce --> Products`, " +"select your product, and in the :guilabel:`Sales` tab, click the " +":guilabel:`Website` you wish the product to be available on. Leave the field" +" empty for the products to be available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:213 +msgid "Stock management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:215 +msgid "" +"Under the :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`, you can enable and configure inventory management options." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:219 +msgid "" +"To display the stock level on the product page, the :guilabel:`Product Type`" +" on the **product's form** must be set to :guilabel:`Storable` (only " +"available when the **Inventory** app is installed)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:224 +msgid "Inventory" +msgstr "מלאי" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:226 +msgid "" +"In the :guilabel:`Inventory Defaults` sub-section, you can select the " +"eCommerce selling strategy of products:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:229 +msgid "" +":guilabel:`Warehouse`: if you have multiple warehouses, you can define the " +"warehouse associated to your website. If you have multiple websites, you can" +" select a different one per website;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:231 +msgid "" +":guilabel:`Out-of-Stock (Continue Selling)`: enabling it allows customers to" +" continue placing orders even when the product is **out-of-stock**. Leave it" +" unchecked to **prevent orders**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:234 +msgid "" +":guilabel:`Show Available Qty`: enabling it displays the available quantity " +"left under a specified threshold on the product page. The available quantity" +" is calculated based on the 'On hand' quantity minus the quantity already " +"reserved for outgoing transfers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:239 +msgid ":ref:`Allow only selected customers to buy `" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:242 +msgid "Selling as kit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:244 +msgid "" +"If you are selling non-prepackaged kits (i.e., the kits are made of " +"individual products), we recommend you read the related documentation to " +"keep track of your stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:248 +msgid "" +":doc:`../../../inventory_and_mrp/manufacturing/management/kit_shipping`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:251 +msgid "Product comparison" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:253 +msgid "" +"You can enable a **product comparison tool** for your eCommerce by going to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`," +" and ticking :guilabel:`Product Comparison Tool`. This tool allows to save " +"products' **specifications** and compare them against each other on a single" +" page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:258 +msgid "" +"On the product page, scroll down to the :guilabel:`Specifications` section " +"and click :guilabel:`Compare`. Repeat the same process for all products you " +"wish to compare. Then, click the :guilabel:`Compare` button of the pop-up " +"window at the bottom of the page to reach the comparison summary." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:264 +msgid "" +"The :guilabel:`Product Comparison Tool` can only be used if :doc:`attributes" +" ` are set on the **product's template**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product comparison window" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:3 -msgid "Manage product variants" +msgid "Product variants" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:5 msgid "" -"Product variants are used to offer variations of the same product to your " -"customers on the product's page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:8 -msgid "" -"Let's say one of your customers selects a T-shirt from your product catalog." +"Product variants are variations, such as different colors, materials, etc., " +"of the same product. These variations can differ in price and availability " +"from the product. Product variants can either be :doc:`created " +"<../../../sales/sales/products_prices/products/variants>` or :doc:`imported " +"<../../../sales/sales/products_prices/products/import>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:10 msgid "" -"Then, they choose the size and color they want. The various size and color " -"combinations are known as product variants." +"To use product variants, enable them under :menuselection:`Website --> " +"Configuration --> Settings`, in the :guilabel:`Shop - Products` section." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:14 -msgid "Create attributes & variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 -msgid "" -"In order to create various attributes and variants for your products, you " -"first need to turn on *Variants* in :menuselection:`Sales --> Configuration " -"--> Settings`." +msgid ":doc:`../managing_products/products`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:19 +msgid "Product configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:21 msgid "" -"Then, select a product from the Products list (:menuselection:`Sales / " -"Website --> Products --> Products`). When the product detail form opens, " -"click on *Edit*, and go to the *Variants* tab." +"Adding attributes and values to a product template allows the enabling of " +"the **product configurator** on the product page. Customers use it to " +"configure and select the product variant of their choice; or in the case of " +"multiple attributes, combine those to create a specific variant." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:22 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Variants configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:29 msgid "" -"Here, you can add as many different attributes as you'd like by clicking on " -"*Add a line*." +"The **display type** of each attribute used in the product configurator can " +"be edited through the **website builder** by clicking :menuselection:`Edit " +"--> Customize` on the product page, and then clicking on one of the " +"attributes. You can then select between four options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:24 -msgid "These attributes appear as three different types:" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:33 +msgid ":guilabel:`Radio`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:26 -msgid "Radio buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:34 +msgid ":guilabel:`Pills`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:27 -msgid "Color buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:35 +msgid ":guilabel:`Select`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:28 -msgid "Drop-down menu" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:36 +msgid ":guilabel:`Color`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:30 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Display type options for attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:44 msgid "" -"Several variants appear as soon as there are two values for one attribute." +"Alternatively, the **display type** can be edited through " +":menuselection:`Website --> eCommerce --> Attributes`, selecting an " +"**attribute**, and then choosing a :guilabel:`Display Type`; or through the " +"**product template** by going to :menuselection:`eCommerce --> Products`, " +"selecting a product, and then clicking :guilabel:`Attributes and Variants`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:32 -msgid "Don't forget to hit *Save* once all variants have been entered." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants values" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:39 -msgid "Edit variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:41 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:50 msgid "" -"After you hit *Save*, you are able to see all the variants from the product " -"template detail form via the *Variants* smart button." +"Specific combinations of values can be excluded from the product " +"configurator. This way, customers are unable to select the excluded " +"combination of values. To do so, go to :menuselection:`Website --> eCommerce" +" --> Products`, select a product, and go to :guilabel:`Attributes and " +"Variants`. Then, click on an **attribute**, select a **value**, and in the " +":guilabel:`Exclude for` section, select a :guilabel:`Product Template` and " +"the :guilabel:`Attribute Values` to exclude." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants smart button" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:58 +msgid "Product specifications" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:48 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:60 msgid "" -"Clicking the *Variants* smart button takes you to the Product Variants page," -" where you can edit the following data for each specific variant:" +"Values used for each attribute are displayed as a **specification list** at " +"the bottom of the product page. To be visible, the **specification list** " +"must first be enabled on the product page by going to :menuselection:`Edit " +"--> Customize` and selecting a placement for the field " +":guilabel:`Specification`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:51 -msgid "Picture(s)" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Specifications list on the product page" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:52 -msgid "Internal Reference (SKU #)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:53 -msgid "Barcode" -msgstr "ברקוד" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:54 -msgid "Volume" -msgstr "נפח" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:55 -msgid "Weight" -msgstr "משקל" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:56 -msgid "Cost" -msgstr "עלות" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:59 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:70 msgid "" -"Both the Barcode and the Internal Reference are variant-specific. You need " -"to populate them once the variants are generated." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:63 -msgid "Set specific prices per variant" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:65 -msgid "" -"You can set a specific public price per variant by clicking on *Configure " -"Variants* in the product detail form (top-left corner). That takes you to " -"the *Product Variant Values* page for that product." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants configure variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:72 -msgid "" -"To set a specific public price for a particular variant, simply click on the" -" variant you want to modify, then click on *Edit*." +"The product **specification list** can also be used on products without " +"variants. For that, make sure to have no values combination. Products with " +"single values for their attributes do not generate variants." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:75 +msgid "Filter catalog by attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:77 msgid "" -"The *Value Price Extra* field represents the monetary value that is added to" -" the original product price whenever the corresponding attribute value is " -"selected." +"Customers **can** filter the **catalog** based on product attributes and " +"values, allowing them to :ref:`filter ` the catalog " +"based only on the attribute(s) of their choice." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:82 -msgid "This is how the *Value Price Extra* looks on your website:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra on the frontend" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:89 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:80 msgid "" -"Pricelist formulas let you set advanced price computation methods for " -"product variants. See :doc:`../maximizing_revenue/pricing`." +"To enable **attributes filtering**, go to :menuselection:`Edit --> " +"Customize` from your **main shop page** and click on one of the " +":guilabel:`Categories` in the left column. Here, enable either " +":guilabel:`Left`, :guilabel:`Top`, or **both**, in the " +":guilabel:`Attributes` field." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:93 -msgid "Disable/archive variants" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Categories buttons" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:95 -msgid "" -"You can disable/archive specific variants so they are no longer available in" -" quotes or on your website (not existing in your stock, deprecated, etc.). " -"Simply select *Archive* in their detail form. You can reactivate them the " -"same way." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:103 -msgid "" -"To retrieve such items, hit *Archived* in the *Filters* category while " -"searching the variants list." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive search" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:110 -msgid ":doc:`../../../sales/sales/products_prices/products/variants`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue.rst:5 -msgid "Maximize my revenue" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "Cross-selling: Accessory and Optional Products" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:5 -msgid "" -"Any sales process is an opportunity to maximize revenues. For example, with " -"an extended warranty or some accessories." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "" -"To do so, you can use **Cross-selling**, a sales technique consisting in " -"selling a customer something in addition to the product or service they were" -" originally shopping for. It is a great way to maximize the value of each " -"one of your customers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "It can be done via two different features:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:14 -msgid "" -":ref:`Accessory products ` on the checkout page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:15 -msgid "" -":ref:`Optional products ` on a new :guilabel:`Add to" -" Cart` screen." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Accessory Products" -msgstr "מוצרים נלווים" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 -msgid "" -"**Accessory Products** are products that are displayed when customers review" -" their cart before paying. As an example, you could suggest a mouse or a " -"keyboard when someone buys a computer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 -msgid "" -"To add *Accessory Products*, go to :menuselection:`Website --> Products --> " -"Products` and, under the :guilabel:`Sales Tab`, add your products to the " -":guilabel:`Accessory Products` field." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an accessory product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:32 -msgid "" -"Now, go to your website and add the product to your cart. On the payment " -"step, you can see your accessory products suggested to the customer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "See of payment view and accessory product suggestion." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "" -"`Odoo Tutorials: Alternative, Accessory, and Optional Products " -"`_." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 -msgid "Optional Products" -msgstr "מוצרים אופציונליים" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "" -"**Optional products** are products directly related to an item. Each time " -"the product is added to a cart, a pop-up appears, suggesting other products " -"to buy." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 -msgid "" -"To enable optional products, go to :menuselection:`Website --> Configuration" -" --> Settings` and tick :guilabel:`Optional Products`. Then, go to " -":menuselection:`Website --> Products --> Products` and open the item you " -"want to add an optional product to. In the :guilabel:`Sales tab` of that " -"product, add as many optional products as you want." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an optional product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:60 -msgid "" -"From now, when a customer adds this product to their cart, a pop-up appears " -"and suggests also adding the optional product(s)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Pop-up with optional products appears." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:68 -msgid ":doc:`upselling`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 -msgid "Adapt prices to website visitors" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:5 -msgid "" -"This section sheds light on pricing features found in the eCommerce app:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:7 -msgid "force a price by geo-localization," -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:9 -msgid "let the customer choose the currency." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:11 -msgid "" -"As a pre-requisite, check out how to managing product pricing: " -":doc:`/applications/sales/sales/products_prices/prices/pricing`)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:15 -msgid "Geo-IP automatically applies the right price" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:17 -msgid "" -"Assign country groups to your pricelists. That way, visitors who aren't " -"logged in yet will get their own currency when landing on your website." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:20 -msgid "Once logged in, they get the pricelist matching their country." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:23 -msgid "Currency selector" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:25 -msgid "" -"In the case that you sell in several currencies, you can let your customers " -"choose their own. Check the *Selectable* box to add the pricelist to the " -"website drop-down menu, which can be found in *Pricelists* under the " -"*Products* menu, located in the Website application." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:35 -msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:36 -msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:37 -msgid ":doc:`promo_code`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:3 -msgid "How to create & share promotional codes" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:5 -msgid "" -"Want to boost your sales for Xmas? Share promocodes through your marketing " -"campaigns and apply any kind of discounts." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:9 -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:13 -#: ../../content/applications/websites/website/publish/multi_website.rst:18 -msgid "Setup" -msgstr "הכנה" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:11 -msgid "" -"Go to :menuselection:`Sales --> Settings` and choose *Advanced pricing based" -" on formula* for *Sale Price*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:14 -msgid "" -"Go to :menuselection:`Website Admin --> Catalog --> Pricelists` and create a" -" new pricelist with the discount rule (see :doc:`pricing`). Then enter a " -"code." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:21 -msgid "" -"Make the promocode field available on your *Shopping Cart* page (option in " -"*Customize* menu). Add a product to cart to reach it." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:27 -msgid "" -"Once turned on you see a new section on the right side. On clicking *Apply* " -"prices get automatically updated in the cart." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:33 -msgid "" -"The promocode used by the customer is stored in the system so you can " -"analyze the performance of your marketing campaigns." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:39 -msgid "Show sales per pricelists..." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:43 -msgid ":doc:`pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:3 -msgid "How to enable comments & rating" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:5 -msgid "" -"Publishing and monitoring customer experience will help you gain the trust " -"of new customers and better engage with your community. In 2 clicks, allow " -"your customer to share their feedback!" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:15 -msgid "" -"Activate comments & rating from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:21 -msgid "" -"Visitors must log in to share their comments. Make sure they are able to do " -"so (see Portal documentation)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:25 -msgid "Review the posts in real time" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:27 -msgid "" -"Whenever a post is published, the product manager and all the product " -"followers get notified in their Inbox (*Discuss* menu)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:34 -msgid "" -"By default the user who created the product is automatically set as " -"follower." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:36 -msgid "" -"Click the product name to open the detail form and review the comment (in " -"the product discussion thread)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:43 -msgid "Moderate & unpublish" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:45 -msgid "" -"You can easily moderate by using the chatter, either in the product detail " -"form or on the web page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:48 -msgid "" -"To unpublish the post, open the product web page and click the *Published* " -"button to turn it red (*Unpublished*)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:56 -msgid "..tip::" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:55 -msgid "" -"You can access the web page from the detail form by clicking the *Published*" -" smart button (and vice versa)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:3 -msgid "How to sell pricier alternative products (upselling)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:5 -msgid "" -"In order to maximize your revenue, suggesting pricier alternative products " -"is strongly advised for basic items. That way, your customer will spend more" -" time browsing your catalog." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:12 -msgid "To do so:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:14 -msgid "" -"Select such *Alternative Products* in the *Sales* tab of the product detail " -"form. 3 alternatives are fine! Don't publish too many otherwise your " -"customers will be confused." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:20 -msgid "" -"Turn on *Alternative Products* from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 -msgid "Get paid" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:3 -msgid "Manage orders paid with Payment Providers" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:5 -msgid "" -"The moment a payment is officially authorized by a Payment Provider, Odoo " -"*automatically* confirms the order, which triggers the delivery. And, if you" -" invoice based on ordered quantities, you are requested to invoice the " -"order, as well." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:9 -msgid "" -"Let’s take a closer look at how to manage orders paid with Payment " -"Providers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:12 -msgid "Checking the status of a payment" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:14 -msgid "" -"To check the status of a payment, go to :menuselection:`Website --> Orders " -"--> Orders`. Then, simply click on the order you wish to check on." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:17 -msgid "" -"Once you are on the Sales Order page, you will find the payment is confirmed" -" with an automatic note in the *Chatter*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "payment is confirmed in the chatter of sales order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:24 -msgid "" -"If the user decides to create an invoice, the payment is directly " -"reconciled. This note in the *Chatter* includes a link to the Payment entry," -" which contains various details about the transaction, along with a link to " -"the related Journal Entry." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "page with details surrounding the specific transaction" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:32 -msgid "" -"Specific messages are provided to your customers for every payment status " -"whenever they are redirected to Odoo after the transaction. To edit these " -"messages, go to the *Messages* tab of the payment method." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:38 -msgid "Automatically generate invoices at order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:40 -msgid "" -"When the order is confirmed, you can also choose to have an invoice " -"automatically issued and paid. This fully-automated feature is designed for " -"businesses that invoice orders right away." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "To do automatically generate invoices at order:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:45 -msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings --> Invoicing`." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:46 -msgid "" -"Then, under the **Invoicing Policy** option, select *Invoice what is " -"ordered*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "Then activate *Automatic Invoices* and *Save*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "example of automatic invoice" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:54 -msgid "Capture payment after the delivery" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:56 -msgid "" -"If the provider handling the payment is configured to capture amounts " -"manually, the order is confirmed, but the amount is kept on hold. Once the " -"delivery is processed, you can capture the payment from the related Sales " -"Order." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:61 -msgid ":doc:`../../../finance/payment_providers`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:62 -msgid "" -":ref:`Payment Providers: Place a hold on a card " -"`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:5 -msgid "" -"It has never been so easy for your customers to access their customer " -"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" -" suggested to sign up (name, email, password) when the order is placed, and " -"not before. Indeed, nothing is more annoying than going through a signup " -"process before buying something." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:14 -msgid "Sign up" -msgstr "הירשם" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:16 -msgid "" -"The invitation to sign up shows up when the customer wants to visualize the " -"order from order confirmation email." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:23 -msgid "Customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:25 -msgid "" -"Once logged in the customer will access the account by clicking *My Account*" -" in the login dropdown menu." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:31 -msgid "" -"THere they find all their history. The main address (billing) can also be " -"modified." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:37 -msgid "" -"If the customer is set as a contact of a company in your address book, they " -"will see all the documents whose the customer belongs to this company." -msgstr "" - -#: ../../content/applications/websites/ecommerce/taxes.rst:5 -msgid "Collect taxes" -msgstr "" - -#: ../../content/applications/websites/livechat.rst:8 +#: ../../content/applications/websites/livechat.rst:6 msgid "Live Chat" msgstr " צ'אט חי" -#: ../../content/applications/websites/livechat.rst:11 -msgid "`Live Chat: product page `_" -msgstr "" - -#: ../../content/applications/websites/livechat/overview.rst:5 -#: ../../content/applications/websites/website/publish/translate.rst:6 -msgid "Overview" -msgstr "סקירה כללית" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:3 -msgid "Get Started with Live Chat" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:5 +#: ../../content/applications/websites/livechat.rst:8 msgid "" "Live Chat has the highest satisfaction rating of any communication tool. It " "allows fast responses and it is accessible and convenient, as your customers" @@ -918,11 +2534,23 @@ msgid "" "your customers want to talk to you, so let's make it easy." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:10 +#: ../../content/applications/websites/livechat.rst:13 +msgid "`Live Chat: product page `_" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:14 +msgid ":doc:`livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:15 +msgid ":doc:`livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:18 msgid "Set up" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:12 +#: ../../content/applications/websites/livechat.rst:20 msgid "" "Once *Live Chat* is installed on your database, if your website was created " "with Odoo, the application is automatically added to it. All that is left to" @@ -930,284 +2558,282 @@ msgid "" "Live Chat`." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the settings page and the live chat feature for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:21 +#: ../../content/applications/websites/livechat.rst:28 msgid "" "Select the channel to be linked to your website or create one on the fly." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a live chat channel form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:27 +#: ../../content/applications/websites/livechat.rst:33 msgid "For both scenarios, under:" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:30 +#: ../../content/applications/websites/livechat.rst:36 msgid "" "- **Operators**: add agents to respond to the chat requests. Add as many as " "you like, and keep in mind that operators that do not show any activity in " "Odoo for more than 30min are considered disconnected." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:33 +#: ../../content/applications/websites/livechat.rst:39 msgid "" "- **Options**: set the default text to be shown on the live chat button; an " "automated welcome message to be seen by visitors when a conversation is " "initiated, and the text that prompts the user to initiate a chat." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:36 +#: ../../content/applications/websites/livechat.rst:42 msgid "" "- **Channel Rules**: choose an action for a given URL, and/or per country. " "In the example below, the chat window automatically pops-up 3 seconds after " "users (from any country) land on the contact us page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a channel’s rules form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:43 +#: ../../content/applications/websites/livechat.rst:48 msgid "" "GeoIP, which refers to the process of finding a computer terminal’s " "geographical location by its IP address, must be installed on your server. " "Otherwise, under *Channel Rules*, countries are not taken into account." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:48 +#: ../../content/applications/websites/livechat.rst:53 msgid "External options" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:51 +#: ../../content/applications/websites/livechat.rst:56 msgid "" "If your website was not created with Odoo, you can find the code to be added" " to your own, under the *Widget* tab." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:52 +#: ../../content/applications/websites/livechat.rst:57 msgid "" "Odoo also offers an URL you can send to users so they can have access to a " "single live chat page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the widget tab for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:59 +#: ../../content/applications/websites/livechat.rst:63 msgid "Managing chat requests" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:61 +#: ../../content/applications/websites/livechat.rst:65 msgid "" "Conversations initiated by visitors pop up as a direct message, and are " "shown in *Discuss*. Therefore, inquiries can be answered wherever you are in" " Odoo." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of the discuss application with a message sent through live chat in " "Odoo" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:69 +#: ../../content/applications/websites/livechat.rst:72 msgid "" "Conversations are dispatched based on the current workload of the online " "operators." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:72 +#: ../../content/applications/websites/livechat.rst:75 msgid "Leave or join a channel" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:74 +#: ../../content/applications/websites/livechat.rst:77 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel under *Live Chat*, and *Join Channel* or *Leave Channel*." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of a channel form and the option to join a channel for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:82 -#: ../../content/applications/websites/livechat/overview/responses.rst:48 -msgid ":doc:`ratings`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:83 -#: ../../content/applications/websites/livechat/overview/ratings.rst:45 -msgid ":doc:`responses`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/ratings.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:3 msgid "Ratings" msgstr "דירוגים" -#: ../../content/applications/websites/livechat/overview/ratings.rst:5 +#: ../../content/applications/websites/livechat/ratings.rst:5 msgid "" "Giving users the opportunity to rate their interactions can help you " "improving the experience you offer. That means staying on top of your " "customers' needs, besides keeping track of your operators’ performances." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:10 +#: ../../content/applications/websites/livechat/ratings.rst:10 msgid "Customer Rating" msgstr "דירוג לקוח" -#: ../../content/applications/websites/livechat/overview/ratings.rst:12 +#: ../../content/applications/websites/livechat/ratings.rst:12 msgid "" "Once the user chooses to close the chat window, he can rate his interaction." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:14 +#: ../../content/applications/websites/livechat/ratings.rst:14 msgid "" "If the user is *Not satisfied* or *Highly dissatisfied*, a field allowing " "for an explanation is shown." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:15 +#: ../../content/applications/websites/livechat/ratings.rst:15 msgid "A copy of the conversation can also be sent by email." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the chat window from a user’s side for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:22 +#: ../../content/applications/websites/livechat/ratings.rst:22 msgid "The rating is shown on the chat window itself for the operator." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "" "View of a chat window from an operator’s side highlighting a rating for Odoo" " Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:28 +#: ../../content/applications/websites/livechat/ratings.rst:28 msgid "And under :menuselection:`Report --> Customer Ratings`." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the customer ratings page in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:35 +#: ../../content/applications/websites/livechat/ratings.rst:35 msgid "Make the rating public" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:37 +#: ../../content/applications/websites/livechat/ratings.rst:37 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel form, click on *Go to Website* and on *Unpublished*, to publish the " "rating of that channel on your website." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the public ratings in the website for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:45 +msgid ":doc:`responses`" +msgstr "" + +#: ../../content/applications/websites/livechat/responses.rst:3 msgid "Commands and Canned Responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:5 +#: ../../content/applications/websites/livechat/responses.rst:5 msgid "" "Using canned responses can help you save time and have a previous, well-" "thought response, to some of your most common questions and comments." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:9 +#: ../../content/applications/websites/livechat/responses.rst:9 msgid "Use commands" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:11 +#: ../../content/applications/websites/livechat/responses.rst:11 msgid "" "Commands are shortcuts that do specific actions within the chat window:" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:13 +#: ../../content/applications/websites/livechat/responses.rst:13 msgid "**/help**: shows a help message." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:14 +#: ../../content/applications/websites/livechat/responses.rst:14 msgid "**/helpdesk**: creates a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:15 +#: ../../content/applications/websites/livechat/responses.rst:15 msgid "**/helpdesk_search**: searches for a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:16 +#: ../../content/applications/websites/livechat/responses.rst:16 msgid "**/history**: shows the last 15 visited pages." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:17 +#: ../../content/applications/websites/livechat/responses.rst:17 msgid "**/lead**: creates a new lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:18 +#: ../../content/applications/websites/livechat/responses.rst:18 msgid "**/leave**: leaves the channel." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *helpdesk tickets*: make sure the application is installed on your " "database and the option *Live Chat* under :menuselection:`Helpdesk --> " "Configuration --> Helpdesk Teams` is enabled." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *leads*: the *CRM* application must be installed on your database." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:26 +#: ../../content/applications/websites/livechat/responses.rst:26 msgid "" "To access the ticket or lead created from the chat, click on the shortcut " "link." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of the chat window with a helpdesk ticket created in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:33 +#: ../../content/applications/websites/livechat/responses.rst:33 msgid "" "Helpdesk tickets created from the chat automatically add the conversation as" " a description of the ticket. The same goes for the creation of a lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:37 +#: ../../content/applications/websites/livechat/responses.rst:37 msgid "Send canned responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:40 +#: ../../content/applications/websites/livechat/responses.rst:40 msgid "" "Canned responses allow you to have a full piece of text being placed when " "you type a shortcut word. To create them, go to :menuselection:`Live Chat " "--> Configuration --> Canned Responses`." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:41 +#: ../../content/applications/websites/livechat/responses.rst:41 msgid "" "To use them during a conversation, simply type **:** followed by the " "shortcut word you created." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of a chat window and the use of a canned response in Odoo Live Chat" msgstr "" +#: ../../content/applications/websites/livechat/responses.rst:48 +msgid ":doc:`ratings`" +msgstr "" + #: ../../content/applications/websites/website.rst:8 msgid "Website" msgstr "אתר אינטרנט" @@ -1218,235 +2844,807 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "" -#: ../../content/applications/websites/website/optimize.rst:5 -msgid "Optimize" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:3 -msgid "How to track your website's traffic in Google Analytics" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:5 -msgid "To follow your website's traffic with Google Analytics:" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:7 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 msgid "" -"`Create a Google Analytics account `__ if" -" you don't have any." +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:10 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 msgid "" -"Go through the creation form and accept the conditions to get the tracking " -"ID." +"Essential cookies, which are necessary for the website to function properly;" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:15 -msgid "Copy the tracking ID to insert it in Odoo." -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:20 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 msgid "" -"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " -"turn on Google Analytics and paste the tracking ID. Then save the page." +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:27 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 msgid "" -"To make your first steps in Google Analytics, refer to `Google Documentation" -" `_." +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR `_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:3 -msgid "Track clicks and visitors using Link Trackers" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 msgid "" -"Link Trackers allow you to track your marketing campaigns (emails, banner " -"ads, blog posts, social media posts, affiliate links, etc.). This way, you " -"are able to identify your best traffic sources and make informed decisions " -"about the distribution of your marketing budget." +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:10 -msgid "Configuration" -msgstr "תצורה" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:12 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings` and activate " -"*Link Trackers*." +"You can :ref:`customize the appearance of your cookies bar ` and :ref:`edit the content of the related Cookie Policy " +"page `." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 msgid "" -"View of Website settings page emphasizing the link trackers field in Odoo " -"Website" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:19 -msgid "Set up traceable URLs" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:21 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 msgid "" -"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " -"page`. Here, you are able to get a specific tracked URL based on the " -"campaign, medium, and source being used." +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone -msgid "View of the link tracker fields for Odoo Website" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:28 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 msgid "" -"**URL**: url of the page you want to track (e.g. the home page or a " -"product's page)." +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:29 -msgid "**Campaign**: context of your link (e.g. a special promotion)." -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:30 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 msgid "" -"**Medium**: channel used to share (deliver) your link (e.g. an email or a " -"Facebook ad)." +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:31 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 msgid "" -"**Source**: platform where the traffic originates (e.g. Google or Twitter)." +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:33 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 msgid "" -"Now, click on *Get tracked link* to generate a URL that you can post or send" -" by the source you have decided on." +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:37 -msgid "Follow-up on tracked links" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:39 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 msgid "" -"To look at statistics of your links, go to :menuselection:`Website --> Go to" -" website --> Promote --> Track this page`. Besides being able to see the " -"*Most Clicked* and *Recently Used* links, you can also see complete " -"statistics by clicking on *Stats*, including the number of clicks, and the " -"country of origin for those clicks." +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 msgid "" -"View of the tracked list emphasizing the statistics buttons in Odoo Website" +"You could add a link providing access to this page, in your website's " +"footer, for example." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:50 -msgid "You can also access the link tracker on *odoo.com/r* via your browser." +#: ../../content/applications/websites/website/configuration/multi_website.rst:3 +msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:51 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Activate the developer mode (:menuselection:`Settings --> Activate the " -"developer mode`) and get access to the *Link Tracker* module and its back-" -"end functionalities." +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:53 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Integrated with :doc:`Google Analytics `, those trackers " -"allow you to see the number of clicks and visitors to keep you on top of " -"your marketing campaigns." +"Each website can be designed and configured independently with its own " +":doc:`domain name `, theme, pages, " +"menus, :doc:`languages `, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages `." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:55 +#: ../../content/applications/websites/website/configuration/multi_website.rst:18 msgid "" -"The integration with the :doc:`CRM " -"` application allows " -"you to understand where your leads and opportunities are coming from." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:3 -msgid "How to track your website's traffic with Plausible.io" +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:5 -msgid "To follow your website's traffic with Plausible.io:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:7 +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"`Create a Plausible.io account `__ if you " -"don't have any." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:9 +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 msgid "" -"`Create your website `__ and `Start " -"collecting data` if it is not already done." +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:11 +#: ../../content/applications/websites/website/configuration/multi_website.rst:36 +msgid "Click the :guilabel:`Create` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Go through the `list of your websites `__ and " -"click on the gear icon." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:16 +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:48 msgid "" -"Click on the button `+ New Link` in the tab Visibility to create your Shared" -" links." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:21 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 msgid "" -"Choose a name (and NO password - it is not supported to embed it in Odoo) " -"and click on the button `Create Shared Link`" +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"Copy the new Shared Link url from Plausible.io and paste it in the Settings " -"of Odoo" +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:34 -msgid "You are on the Odoo Saas Platform?" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:36 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 msgid "" -"When you `create your database on www.odoo.com/trial " -"`__, we create it for you on our own server. You" -" don't have anything to do." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:40 -msgid "What about the Goal?" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:42 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 msgid "" -"Odoo push out-of-the-box some custom event: `Lead Generation` and `Shop`." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:3 -msgid "How to do Search Engine Optimisation (SEO) in Odoo" +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:5 +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 +msgid "" +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:98 +msgid "Records and features can be made available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:100 +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:102 +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:106 +msgid "Website pages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:108 +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:111 +msgid "Select the website on which the page is currently published." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website `." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:132 +msgid "" +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "תמחור" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:139 +msgid "" +"Products can be priced differently based on the website using " +":ref:`pricelists `. The following configuration is " +"required:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "דו\"חות" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:155 +msgid "" +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 +msgid "" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 +msgid "Geo IP Installation (On-Premises Database)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:6 +msgid "Installation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:9 +msgid "" +"Please note that the installation depends on your computer's operating " +"system and distribution. We will assume that a Linux operating system is " +"being used." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:15 +msgid "Install `geoip2 `__ Python library" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:17 +msgid "" +"Download the `GeoLite2 City database " +"`_. You should end up with a" +" file called ``GeoLite2-City.mmdb``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:22 +msgid "Move the file to the folder ``/usr/share/GeoIP/``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:24 +msgid "Restart the server" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:27 +msgid "" +"If you can't/don't want to locate the geoip database in " +"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " +"command line interface. This option takes the absolute path to the GeoIP " +"database file and uses it as the GeoIP database. For example:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:36 +msgid ":doc:`CLI documentation `." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:39 +msgid "" +"``GeoIP`` Python library can also be used. However this version is " +"discontinued since January 1. See `GeoLite Legacy databases are now " +"discontinued `_" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:44 +msgid "How To Test GeoIP Geolocation In Your Odoo Website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:46 +msgid "Go to your website. Open the web page that you want to test ``GeoIP``." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:47 +msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:48 +msgid "Add the following piece of XML in the page :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:54 +msgid "" +"You should end up with a dictionary indicating the location of the IP " +"address." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:60 +msgid "" +"If the curly braces are empty ``{}``, it can be for any of the following " +"reasons :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:62 +msgid "" +"The browsing IP address is the localhost (``127.0.0.1``) or a local area " +"network one (``192.168.*.*``)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:64 +msgid "" +"If a reversed proxy is used, make sure to configure it correctly. See " +":option:`proxy mode `" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:66 +msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:67 +msgid "The GeoIP database was unable to resolve the given IP address" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:3 +msgid "Translations" +msgstr "תרגום" + +#: ../../content/applications/websites/website/configuration/translate.rst:5 +msgid "" +"The contents of your website pages (i.e., text strings) can be translated " +"into different languages directly on your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:8 +msgid "" +"Your website is displayed in the language that matches the visitor's " +"browser's language, unless that particular language has not been installed. " +"In this case, the website is displayed in the :ref:`default language " +"`. The visitor can still select another language" +" in the language menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:14 +msgid "Installing languages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:16 +msgid "" +"To translate your website, you first have to add the required languages:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:18 +msgid "Go to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:19 +msgid "Scroll to the bottom of the page to the **language menu**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:20 +msgid "Click the language and select :guilabel:`Add a language`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:25 +msgid "" +"Click the :guilabel:`Languages` field and select the required language from " +"the drop-down list. Repeat this step for each additional language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:27 +msgid "Click the :guilabel:`Add` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:30 +msgid "" +"You can also edit your website's languages from the backend, in the " +":guilabel:`Settings`. Go to :menuselection:`Website –> Configuration –> " +"Settings` and add/remove the required languages in the :guilabel:`Languages`" +" field, in the :guilabel:`Website info` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:37 +msgid "Default language" +msgstr "שפת ברירת מחדל" + +#: ../../content/applications/websites/website/configuration/translate.rst:39 +msgid "" +"If the language of the visitor's browser is not installed on your website, " +"the content is displayed in the default language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:42 +msgid "" +"To define a default language, go to :menuselection:`Website –> Configuration" +" –> Settings`, and select a language in the :guilabel:`Default` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:46 +msgid "" +"This field is visible only if multiple languages are already configured for " +"your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:49 +msgid "Translating the contents" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:51 +msgid "" +"Once the languages have been added, you can translate the contents of your " +"website. To do so, go to your website, select the language from the language" +" menu and click the :guilabel:`Translate` button on the right part of the " +"task bar to activate the **translation mode**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Translate button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:58 +msgid "As a result:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:60 +msgid "" +"Text strings that have already been translated are highlighted in green;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:61 +msgid "Text strings that need to be translated are highlighted in yellow." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Text to be translated highlighted in yellow" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:66 +msgid "" +"You can then replace the original text with the translation by clicking the " +"block, editing its contents and saving." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:70 +msgid "" +"Once the languages have been installed, you can also translate some items " +"(e.g., the product's name and description) from the backend (e.g., in the " +"product template). To do so, click the language code (e.g., :guilabel:`EN`) " +"next to the text you want to translate (e.g., the product name) and add the " +"translation." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Translate product-related items." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:78 +msgid "" +"You can also :doc:`export/import translations " +"<../../../../developer/howtos/translations>` to translate multiple items " +"(e.g., product names and descriptions) in one go." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:82 +msgid "Language selector menu" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:84 +msgid "To add a language selector menu:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:86 +msgid "Go to your website and click :guilabel:`Edit`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:87 +msgid "" +"Select the block where you want to add the language selector menu (e.g., the" +" header)." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:88 +msgid "Select the :guilabel:`Customize` tab." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:89 +msgid "" +"In the :guilabel:`Navbar` section, set the :guilabel:`Language selector` " +"field to either :guilabel:`Dropdown` or :guilabel:`Inline`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language selector menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:95 +msgid "Click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:3 +msgid "Unsplash (free images)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:6 +msgid "Generate an Unsplash access key" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:9 +msgid "" +"**As an Odoo Online user**, you are ready to use Unsplash. You won't need to" +" follow this guide to set up Unsplash information since you will use our own" +" Odoo Unsplash key in a transparent way." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:13 +msgid "Generate an Unsplash access key for non-Odoo Online users" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:15 +msgid "Create an account on `Unsplash.com `_." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:17 +msgid "" +"Go to your `applications dashboard " +"`_ and click on **New " +"Application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:23 +msgid "Accept the conditions and click on **Accept terms**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:28 +msgid "" +"You will be prompted to insert an **Application name** and a " +"**Description**. Please prefix your application name by \"**Odoo:** \" so " +"that Unsplash can recognize it as an Odoo instance. Once done, click on " +"**Create application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:35 +msgid "" +"You should be redirected to your application details page. Scroll down a bit" +" to find your **access key**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:42 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a " +"restriction of 50 Unsplash requests per hour." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:46 +msgid "Generate an Unsplash application ID" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:49 +msgid "You should first create and set up your Unsplash application." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:51 +msgid "" +"Go to your `applications dashboard " +"`_ and click on your newly created " +"Unsplash application under **Your applications**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:57 +msgid "" +"You will be redirected to your application details page. The **application " +"ID** will be visible in your browser's URL. The URL should be something like" +" ``https://unsplash.com/oauth/applications/``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:65 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a 50 " +"Unsplash requests per hour restriction." +msgstr "" + +#: ../../content/applications/websites/website/pages.rst:5 +msgid "Pages" +msgstr "דפים" + +#: ../../content/applications/websites/website/pages/seo.rst:3 +msgid "Search Engine Optimisation (SEO)" +msgstr "" + +#: ../../content/applications/websites/website/pages/seo.rst:5 msgid "" "Search Engine Optimization (SEO) is a set of good practices to optimize your" " website so that you get a better ranking in search engines like Google. In " "short, a good SEO allows you to get more visitors." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:9 +#: ../../content/applications/websites/website/pages/seo.rst:9 msgid "" "Some examples of SEO rules: your web pages should load fast, your page " "should have one and only one title ``

``, meta tags (alt-tag, title-tag) " @@ -1454,28 +3652,28 @@ msgid "" "``/sitemap.xml`` file, etc." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:15 +#: ../../content/applications/websites/website/pages/seo.rst:15 msgid "" "To guarantee Odoo Website and Odoo eCommerce users have a great SEO, Odoo " "abstracts all the technical complexities of SEO and handles everything for " "you, in the best possible way. This will be explained here below." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:20 +#: ../../content/applications/websites/website/pages/seo.rst:20 msgid "" "But first, let see how you can easily boost your ranking by finetuning the " "content and the meta tags of your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:24 +#: ../../content/applications/websites/website/pages/seo.rst:24 msgid "Meta Tags" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:27 +#: ../../content/applications/websites/website/pages/seo.rst:27 msgid "Title, Description" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:29 +#: ../../content/applications/websites/website/pages/seo.rst:29 msgid "" "Every web page should define the ```` and ``<description>`` meta " "data. These information elements are used by search engines to promote your " @@ -1484,11 +3682,11 @@ msgid "" "otherwise you will be downgraded by search engines." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:39 +#: ../../content/applications/websites/website/pages/seo.rst:39 msgid "Keywords" msgstr "מילות מפתח" -#: ../../content/applications/websites/website/optimize/seo.rst:40 +#: ../../content/applications/websites/website/pages/seo.rst:41 msgid "" "In order to write quality content and boost your traffic, Odoo provides a " "``<keyword>`` finder. Those keywords are the searches you want to head " @@ -1497,28 +3695,28 @@ msgid "" "the related searches in Google. The more keywords are used the better." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:50 +#: ../../content/applications/websites/website/pages/seo.rst:51 msgid "" "If your website is in multiple languages, you can use the Promote tool for " "every language of a single page and set specific title, description and " "search tags." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:55 +#: ../../content/applications/websites/website/pages/seo.rst:56 msgid "Content is King" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:57 +#: ../../content/applications/websites/website/pages/seo.rst:58 msgid "" "When it comes to SEO, content is usually king. Odoo provides several modules" " to help you build your website content:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:60 +#: ../../content/applications/websites/website/pages/seo.rst:61 msgid "**Odoo Blogs**: write great contents." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:62 +#: ../../content/applications/websites/website/pages/seo.rst:63 msgid "" "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their " "content is automatically indexed on the web page. Example: " @@ -1526,147 +3724,147 @@ msgid "" "channel-1>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:66 +#: ../../content/applications/websites/website/pages/seo.rst:67 msgid "" "**Odoo Forum**: let your community create contents for you. Example: " "`odoo.com/forum/1 <https://odoo.com/forum/1>`_ (accounts for 30% of Odoo.com" " landing pages)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:70 +#: ../../content/applications/websites/website/pages/seo.rst:71 msgid "" "**Odoo Mailing List Archive**: publish mailing list archives on your " "website. Example: `odoo.com/groups/community-59 " "<https://www.odoo.com/groups/community-59>`_ (1000 pages created per month)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:76 +#: ../../content/applications/websites/website/pages/seo.rst:77 msgid "" "The 404 page is a regular page, that you can edit like any other page in " "Odoo. That way, you can build a great 404 page to redirect to the top " "content of your website when visitors get lost in invalid URLs." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:81 +#: ../../content/applications/websites/website/pages/seo.rst:82 msgid "Use Social Networks" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:83 +#: ../../content/applications/websites/website/pages/seo.rst:84 msgid "" "Social media is built for mass sharing. If lots of people share your content" " on social media, then it's likely more people will link to it, and links " "are a huge factor for SEO ranking." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:87 +#: ../../content/applications/websites/website/pages/seo.rst:88 msgid "Odoo embeds several tools to share content through social media:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:90 +#: ../../content/applications/websites/website/pages/seo.rst:91 msgid "Social Network" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:92 +#: ../../content/applications/websites/website/pages/seo.rst:93 msgid "" "Odoo allows to link all your social network accounts in your website footer." " All you have to do is to refer all your accounts in your company settings." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:99 +#: ../../content/applications/websites/website/pages/seo.rst:100 msgid "Social Share" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:101 +#: ../../content/applications/websites/website/pages/seo.rst:102 msgid "" "Drop the building block *Share* on any page you want your visitors to share." " By clicking the icon, they are prompted to share the page in their social " "media wall." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:108 +#: ../../content/applications/websites/website/pages/seo.rst:109 msgid "" "Most social media use a picture of the picture to decorate the share post. " "Odoo uses the website logo by default but you can choose any other image of " "your page in the Promote tool." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:116 +#: ../../content/applications/websites/website/pages/seo.rst:117 msgid "Facebook Page" msgstr "דף פייסבוק" -#: ../../content/applications/websites/website/optimize/seo.rst:118 +#: ../../content/applications/websites/website/pages/seo.rst:119 msgid "" "Drop the building block *Facebook Page* to display a widget of your Facebook" " business page and encourage visitors to follow it. You can display the " "timeline, the next events and the messages." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:123 +#: ../../content/applications/websites/website/pages/seo.rst:124 msgid "Twitter Scroller" msgstr "גולל של טוויטר" -#: ../../content/applications/websites/website/optimize/seo.rst:125 +#: ../../content/applications/websites/website/pages/seo.rst:126 msgid "" "Display the Twitter feeds with customer satifaction on your website. This " "will increase the number of tweets and shares." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:129 +#: ../../content/applications/websites/website/pages/seo.rst:130 msgid "Test Your Website" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:131 +#: ../../content/applications/websites/website/pages/seo.rst:132 msgid "" "You can compare how your website rank, in terms of SEO, against Odoo using " "WooRank free services: `woorank.com <https://www.woorank.com>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:136 +#: ../../content/applications/websites/website/pages/seo.rst:137 msgid "URLs Handling" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:138 +#: ../../content/applications/websites/website/pages/seo.rst:139 msgid "This section sheds some light on how Odoo makes URLs SEO-friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:141 +#: ../../content/applications/websites/website/pages/seo.rst:142 msgid "URLs Structure" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:143 +#: ../../content/applications/websites/website/pages/seo.rst:144 msgid "A typical Odoo URL will look like this:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:145 +#: ../../content/applications/websites/website/pages/seo.rst:146 msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:147 +#: ../../content/applications/websites/website/pages/seo.rst:148 msgid "With the following components:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:149 +#: ../../content/applications/websites/website/pages/seo.rst:150 msgid "**https://** = Protocol" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:151 +#: ../../content/applications/websites/website/pages/seo.rst:152 msgid "**www.mysite.com** = your domain name" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:153 +#: ../../content/applications/websites/website/pages/seo.rst:154 msgid "" "**/fr\\_FR** = page language. This part of the URL is removed if the visitor" " browses the main language of the website Thus, the main version of this " "page is: https://www.mysite.com/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:158 +#: ../../content/applications/websites/website/pages/seo.rst:159 msgid "" "**/shop/product** = every module defines its own namespace (/shop is for the" " catalog of the eCommerce module, /shop/product is for a product page)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:162 +#: ../../content/applications/websites/website/pages/seo.rst:163 msgid "" "**my-great-product** = by default, this is the slugified title of the " "product this page refers to. But you can customize it for SEO purposes. A " @@ -1675,100 +3873,100 @@ msgid "" "forum post, forum comment, product category, etc.)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:169 +#: ../../content/applications/websites/website/pages/seo.rst:170 msgid "**-31** = the unique ID of the product" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:171 +#: ../../content/applications/websites/website/pages/seo.rst:172 msgid "" "Note that any dynamic component of an URL can be reduced to its ID. As an " "example, the following URLs all do a 301 redirect to the above URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:174 +#: ../../content/applications/websites/website/pages/seo.rst:175 msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:176 +#: ../../content/applications/websites/website/pages/seo.rst:177 msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:178 +#: ../../content/applications/websites/website/pages/seo.rst:179 msgid "" "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product " "name)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:181 +#: ../../content/applications/websites/website/pages/seo.rst:182 msgid "" "Some URLs have several dynamic parts, like this one (a blog category and a " "post):" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:184 +#: ../../content/applications/websites/website/pages/seo.rst:185 msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:186 +#: ../../content/applications/websites/website/pages/seo.rst:187 msgid "In the above example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:188 +#: ../../content/applications/websites/website/pages/seo.rst:189 msgid "*Company News* is the title of the blog" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:190 +#: ../../content/applications/websites/website/pages/seo.rst:191 msgid "*The Odoo Story* is the title of a specific blog post" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:192 +#: ../../content/applications/websites/website/pages/seo.rst:193 msgid "" "When an Odoo page has a pager, the page number is set directly in the URL " "(does not have a GET argument). This allows every page to be indexed by " "search engines. Example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:196 +#: ../../content/applications/websites/website/pages/seo.rst:197 msgid "https://www.odoo.com/blog/page/3" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:199 +#: ../../content/applications/websites/website/pages/seo.rst:200 msgid "Changes in URLs & Titles" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:201 +#: ../../content/applications/websites/website/pages/seo.rst:202 msgid "" "When the URL of a page changes (e.g. a more SEO friendly version of your " "product name), you don't have to worry about updating all links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:204 +#: ../../content/applications/websites/website/pages/seo.rst:205 msgid "Odoo will automatically update all its links to the new URL." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:206 +#: ../../content/applications/websites/website/pages/seo.rst:207 msgid "" "If external websites still points to the old URL, a 301 redirect will be " "done to route visitors to the new address of the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:209 +#: ../../content/applications/websites/website/pages/seo.rst:210 msgid "As an example, this URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:211 +#: ../../content/applications/websites/website/pages/seo.rst:212 msgid "http://mysite.com/shop/product/old-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:213 +#: ../../content/applications/websites/website/pages/seo.rst:214 msgid "Will automatically redirect to:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:215 +#: ../../content/applications/websites/website/pages/seo.rst:216 msgid "http://mysite.com/shop/product/new-and-better-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:217 +#: ../../content/applications/websites/website/pages/seo.rst:218 msgid "" "In short, just change the title of a blog post or the name of a product, and" " the changes will apply automatically everywhere in your website. The old " @@ -1776,11 +3974,11 @@ msgid "" "maintaining the SEO link juice." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:223 +#: ../../content/applications/websites/website/pages/seo.rst:224 msgid "HTTPS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:225 +#: ../../content/applications/websites/website/pages/seo.rst:226 msgid "" "Search engines boost ranking of secure HTTPS/SSL websites. So, by default " "all Odoo Online instances are fully based on HTTPS. If the visitor accesses " @@ -1788,84 +3986,84 @@ msgid "" "equivalent." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:231 +#: ../../content/applications/websites/website/pages/seo.rst:232 msgid "Links: Nofollow Strategy" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:233 +#: ../../content/applications/websites/website/pages/seo.rst:234 msgid "" "The more a page is linked from external and quality websites, the better it " "is for your SEO." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:236 +#: ../../content/applications/websites/website/pages/seo.rst:237 msgid "Here are Odoo strategies to manage links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:238 +#: ../../content/applications/websites/website/pages/seo.rst:239 msgid "" "Every link you add to your website is \"dofollow\", which means that this " "link will contribute to the SEO Juice for the linked page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:242 +#: ../../content/applications/websites/website/pages/seo.rst:243 msgid "" "Every link posted by a contributor (forum post, blog comment, etc.) that " "links to your own website is \"dofollow\" too." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:245 +#: ../../content/applications/websites/website/pages/seo.rst:246 msgid "" "But every link posted by a contributor that links to an external website is " "\"nofollow\". In that way, you do not run the risk of people posting links " "on your website to third-party websites which have a bad reputation." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:250 +#: ../../content/applications/websites/website/pages/seo.rst:251 msgid "" "Note that, when using the forum, contributors having a lot of Karma can be " "trusted. In such case, their links will not have any ``rel=\"nofollow\"`` " "attribute." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:255 +#: ../../content/applications/websites/website/pages/seo.rst:256 msgid "Multi-Language Support" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:258 +#: ../../content/applications/websites/website/pages/seo.rst:261 msgid "Multi-Language URLs" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:260 +#: ../../content/applications/websites/website/pages/seo.rst:263 msgid "" "If you run a website in multiple languages, the same content will be " "available in different URLs, depending on the language used:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:263 +#: ../../content/applications/websites/website/pages/seo.rst:266 msgid "" "https://www.mywebsite.com/shop/product/my-product-1 (main language, English " "here)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:265 +#: ../../content/applications/websites/website/pages/seo.rst:268 msgid "" "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French " "version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:267 +#: ../../content/applications/websites/website/pages/seo.rst:270 msgid "" "In this example, fr\\_FR is the language of the page. You can even have " "several variations of the same language: pt\\_BR (Portuguese from Brazil) , " "pt\\_PT (Portuguese from Portugal)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:272 +#: ../../content/applications/websites/website/pages/seo.rst:275 msgid "Language Annotation" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:274 +#: ../../content/applications/websites/website/pages/seo.rst:277 msgid "" "To let search engines know that the second URL is the French translation of " "the first URL, Odoo will add an HTML link element in the header. In the HTML" @@ -1873,34 +4071,34 @@ msgid "" "pointing to the translated versions of that webpage;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:279 +#: ../../content/applications/websites/website/pages/seo.rst:282 msgid "" "<link rel=\"alternate\" hreflang=\"fr\" " "href=\"https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1\"/>" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:282 +#: ../../content/applications/websites/website/pages/seo.rst:285 msgid "With this approach:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:284 +#: ../../content/applications/websites/website/pages/seo.rst:287 msgid "" "Search engines will redirect to the right language according to the visitor " "language." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:287 +#: ../../content/applications/websites/website/pages/seo.rst:290 msgid "" "You do not get penalized by search engines if your page is not translated " "yet. Indeed, it's not a duplicated content, but a different version of the " "same content." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:292 +#: ../../content/applications/websites/website/pages/seo.rst:295 msgid "Language Detection" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:294 +#: ../../content/applications/websites/website/pages/seo.rst:297 msgid "" "When a visitor lands for the first time on your website (e.g. " "yourwebsite.com/shop), they may automatically be redirected to a translated " @@ -1908,13 +4106,13 @@ msgid "" "yourwebsite.com/fr\\_FR/shop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:299 +#: ../../content/applications/websites/website/pages/seo.rst:302 msgid "" "Next time, it keeps a cookie of the current language to avoid any " "redirection." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:302 +#: ../../content/applications/websites/website/pages/seo.rst:305 msgid "" "To force a visitor to stick to the default language, you can use the code of" " the default language in your link, example: yourwebsite.com/en\\_US/shop. " @@ -1922,15 +4120,15 @@ msgid "" "using the browser language preferences." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:309 +#: ../../content/applications/websites/website/pages/seo.rst:312 msgid "Page Speed" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:312 +#: ../../content/applications/websites/website/pages/seo.rst:315 msgid "Introduction" msgstr "הקדמה" -#: ../../content/applications/websites/website/optimize/seo.rst:314 +#: ../../content/applications/websites/website/pages/seo.rst:317 msgid "" "The time to load a page is an important criteria for search engines. A " "faster website not only improves your visitor's experience, but gives you a " @@ -1942,42 +4140,42 @@ msgid "" "amazon-16-billion-sales>`__." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:325 +#: ../../content/applications/websites/website/pages/seo.rst:328 msgid "" "Fortunately, Odoo does all the magic for you. Below, you will find the " "tricks Odoo uses to speed up your page loading time. You can compare how " "your website ranks using these two tools:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:329 +#: ../../content/applications/websites/website/pages/seo.rst:332 msgid "" "`Google Page Speed " "<https://developers.google.com/speed/pagespeed/insights/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:331 +#: ../../content/applications/websites/website/pages/seo.rst:334 msgid "`Pingdom Website Speed Test <http://tools.pingdom.com/fpt/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:334 +#: ../../content/applications/websites/website/pages/seo.rst:337 msgid "Images" msgstr "תמונות" -#: ../../content/applications/websites/website/optimize/seo.rst:336 +#: ../../content/applications/websites/website/pages/seo.rst:339 msgid "" "When you upload new images, Odoo automatically compresses them to reduce " "their sizes (lossless compression for .PNG and .GIF and lossy compression " "for .JPG)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:340 +#: ../../content/applications/websites/website/pages/seo.rst:343 msgid "" "From the upload button, you have the option to keep the original image " "unmodified if you prefer to optimize the quality of the image rather than " "performance." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:348 +#: ../../content/applications/websites/website/pages/seo.rst:351 msgid "" "Odoo compresses images when they are uploaded to your website, not when " "requested by the visitor. Thus, it's possible that, if you use a third-party" @@ -1985,18 +4183,18 @@ msgid "" "images used in Odoo official themes have been compressed by default." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:354 +#: ../../content/applications/websites/website/pages/seo.rst:357 msgid "" "When you click on an image, Odoo shows you the Alt and title attributes of " "the ``<img>`` tag. You can click on it to set your own title and Alt " "attributes for the image." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:361 +#: ../../content/applications/websites/website/pages/seo.rst:364 msgid "When you click on this link, the following window will appear:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:366 +#: ../../content/applications/websites/website/pages/seo.rst:369 msgid "" "Odoo's pictograms are implemented using a font (`Font Awesome " "<https://fortawesome.github.io/Font-Awesome/icons/>`__ in most Odoo themes)." @@ -2004,32 +4202,32 @@ msgid "" "not result in extra requests to load the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:375 +#: ../../content/applications/websites/website/pages/seo.rst:378 msgid "Static Resources: CSS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:377 +#: ../../content/applications/websites/website/pages/seo.rst:380 msgid "" "All CSS files are pre-processed, concatenated, minified, compressed and " "cached (server-side and browser-side). The result:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:380 +#: ../../content/applications/websites/website/pages/seo.rst:383 msgid "only one CSS file request is needed to load a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:382 +#: ../../content/applications/websites/website/pages/seo.rst:385 msgid "" "this CSS file is shared and cached amongst pages, so that when the visitor " "clicks on another page, the browser doesn't have to even load a single CSS " "resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:386 +#: ../../content/applications/websites/website/pages/seo.rst:389 msgid "this CSS file is optimized to be small" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:388 +#: ../../content/applications/websites/website/pages/seo.rst:391 msgid "" "**Pre-processed:** The CSS framework used by Odoo is Bootstrap. Although a " "theme might use another framework, most of `Odoo themes " @@ -2039,7 +4237,7 @@ msgid "" "file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:395 +#: ../../content/applications/websites/website/pages/seo.rst:398 msgid "" "**Concatenated:** every module or library you might use in Odoo has its own " "set of CSS, Less or Sass files (eCommerce, blogs, themes, etc.). Having " @@ -2051,7 +4249,7 @@ msgid "" "on the number of requests to be done than the actual file size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:405 +#: ../../content/applications/websites/website/pages/seo.rst:408 msgid "" "To address this issue, all CSS / Less / Sass files are concatenated into a " "single .CSS file to send to the browser. So a visitor has **only one .CSS " @@ -2060,55 +4258,55 @@ msgid "" "browser does not even have to load a new CSS file!" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**Both files in the <head>**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**What the visitor gets (only one file)**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 +#: ../../content/applications/websites/website/pages/seo.rst:417 msgid "/\\* From bootstrap.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:421 -#: ../../content/applications/websites/website/optimize/seo.rst:447 +#: ../../content/applications/websites/website/pages/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:424 +#: ../../content/applications/websites/website/pages/seo.rst:450 msgid ".text-muted {" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:422 -#: ../../content/applications/websites/website/optimize/seo.rst:448 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:425 +#: ../../content/applications/websites/website/pages/seo.rst:451 msgid "color: #666;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "color: #777;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "background: yellow" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:420 msgid "background: yellow;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 -#: ../../content/applications/websites/website/optimize/seo.rst:418 -#: ../../content/applications/websites/website/optimize/seo.rst:423 -#: ../../content/applications/websites/website/optimize/seo.rst:449 +#: ../../content/applications/websites/website/pages/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:421 +#: ../../content/applications/websites/website/pages/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:452 msgid "}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:423 msgid "/\\* From my-theme.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:429 msgid "" "The CSS sent by Odoo includes all CSS / Less / Sass of all pages / modules. " "By doing this, additional page views from the same visitor will not have to " @@ -2120,79 +4318,79 @@ msgid "" " backend (/web)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:436 +#: ../../content/applications/websites/website/pages/seo.rst:439 msgid "" "If the CSS file is very big, Odoo will split it into two smaller files to " "avoid the 4095 selectors limit per sheet of Internet Explorer. But most " "themes fit below this limit." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:440 +#: ../../content/applications/websites/website/pages/seo.rst:443 msgid "" "**Minified:** After being pre-processed and concatenated, the resulting CSS " "is minified to reduce its size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**Before minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**After minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid "/\\* some comments \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid ".text-muted {color: #666}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:452 +#: ../../content/applications/websites/website/pages/seo.rst:455 msgid "" "The final result is then compressed, before being delivered to the browser." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:455 +#: ../../content/applications/websites/website/pages/seo.rst:458 msgid "" "Then, a cached version is stored server-side (so we do not have to pre-" "process, concatenate, minify at every request) and browser-side (so the same" " visitor will load the CSS only once for all pages they visit)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:461 +#: ../../content/applications/websites/website/pages/seo.rst:464 msgid "Static Resources: Javascript" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:463 +#: ../../content/applications/websites/website/pages/seo.rst:466 msgid "" "As with CSS resources, Javascript resources are also concatenated, minified," " compressed and cached (server-side and browser-side)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:466 +#: ../../content/applications/websites/website/pages/seo.rst:469 msgid "Odoo creates three Javascript bundles:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:468 +#: ../../content/applications/websites/website/pages/seo.rst:471 msgid "" "One for all pages of the website (including code for parallax effects, form " "validation, etc.)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:471 +#: ../../content/applications/websites/website/pages/seo.rst:474 msgid "" "One for common Javascript code shared among frontend and backend (Bootstrap)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:474 +#: ../../content/applications/websites/website/pages/seo.rst:477 msgid "" "One for backend specific Javascript code (Odoo Web Client interface for your" " employees using Odoo)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:477 +#: ../../content/applications/websites/website/pages/seo.rst:480 msgid "" "Most visitors of your website will only need the first two bundles, " "resulting in a maximum of two Javascript files to load to render one page. " @@ -2200,7 +4398,7 @@ msgid "" "visitor will not load any other Javascript resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:483 +#: ../../content/applications/websites/website/pages/seo.rst:486 msgid "" "If you work on :ref:`developer mode <developer-mode>`, the CSS and " "Javascript are neither concatenated, nor minified. Thus, it's much slower. " @@ -2208,102 +4406,102 @@ msgid "" "Javascript resources are not transformed from their original versions." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:488 +#: ../../content/applications/websites/website/pages/seo.rst:491 msgid "CDN" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:490 +#: ../../content/applications/websites/website/pages/seo.rst:493 msgid "" "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, " "images) are loaded from a Content Delivery Network. Using a Content Delivery" " Network has three advantages:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:494 +#: ../../content/applications/websites/website/pages/seo.rst:497 msgid "" "Load resources from a nearby server (most CDN have servers in main countries" " around the globe)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:497 +#: ../../content/applications/websites/website/pages/seo.rst:500 msgid "" "Cache resources efficiently (no computation resources usage on your own " "server)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:500 +#: ../../content/applications/websites/website/pages/seo.rst:503 msgid "" "Split the resource loading on different services allowing to load more " "resources in parallel (since the Chrome limit of 6 parallel requests is by " "domain)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:504 +#: ../../content/applications/websites/website/pages/seo.rst:507 msgid "" "You can configure your CDN options from the **Website Admin** app, using the" " Configuration menu. Here is an example of configuration you can use:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:511 +#: ../../content/applications/websites/website/pages/seo.rst:514 msgid "HTML Pages" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:513 +#: ../../content/applications/websites/website/pages/seo.rst:516 msgid "" "The HTML pages can be compressed, but this is usually handled by your web " "server (NGINX or Apache)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:516 +#: ../../content/applications/websites/website/pages/seo.rst:519 msgid "" "The Odoo Website builder has been optimized to guarantee clean and short " "HTML code. Building blocks have been developed to produce clean HTML code, " "usually using Bootstrap and the HTML editor." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:520 +#: ../../content/applications/websites/website/pages/seo.rst:523 msgid "" "As an example, if you use the color picker to change the color of a " "paragraph to the primary color of your website, Odoo will produce the " "following code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:524 +#: ../../content/applications/websites/website/pages/seo.rst:527 msgid "``<p class=\"text-primary\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:526 +#: ../../content/applications/websites/website/pages/seo.rst:529 msgid "" "Whereas most HTML editors (such as CKEditor) will produce the following " "code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:529 +#: ../../content/applications/websites/website/pages/seo.rst:532 msgid "``<p style=\"color: #AB0201\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:532 +#: ../../content/applications/websites/website/pages/seo.rst:535 msgid "Responsive Design" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:534 +#: ../../content/applications/websites/website/pages/seo.rst:537 msgid "" "Websites that are not mobile-friendly are negatively impacted in search " "engine rankings. All Odoo themes rely on Bootstrap to render efficiently " "according to the device: desktop, tablet or mobile." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:541 +#: ../../content/applications/websites/website/pages/seo.rst:544 msgid "" "As all Odoo modules share the same technology, absolutely all pages in your " "website are mobile friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:545 +#: ../../content/applications/websites/website/pages/seo.rst:548 msgid "Browser Caching" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:547 +#: ../../content/applications/websites/website/pages/seo.rst:550 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 " @@ -2313,44 +4511,44 @@ msgid "" "your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:554 +#: ../../content/applications/websites/website/pages/seo.rst:557 msgid "" "This allows Odoo to set a very long cache delay (XXX) on these resources: " "XXX secs, while being updated instantly if you update the resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:559 +#: ../../content/applications/websites/website/pages/seo.rst:562 msgid "Scalability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:561 +#: ../../content/applications/websites/website/pages/seo.rst:564 msgid "" "In addition to being fast, Odoo is also more scalable than traditional CMS " "and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:564 +#: ../../content/applications/websites/website/pages/seo.rst:567 msgid "" "Here is the slide that summarizes the scalability of Odoo Website & " "eCommerce." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:570 +#: ../../content/applications/websites/website/pages/seo.rst:573 msgid "Search Engines Files" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:573 +#: ../../content/applications/websites/website/pages/seo.rst:576 msgid "Sitemap" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:575 +#: ../../content/applications/websites/website/pages/seo.rst:578 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/pages/seo.rst:582 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, " @@ -2359,22 +4557,22 @@ msgid "" "chunks per file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:585 +#: ../../content/applications/websites/website/pages/seo.rst:588 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:587 +#: ../../content/applications/websites/website/pages/seo.rst:590 msgid "``<loc>`` : the URL of a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:589 +#: ../../content/applications/websites/website/pages/seo.rst:592 msgid "" "``<lastmod>`` : 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:594 +#: ../../content/applications/websites/website/pages/seo.rst:597 msgid "" "``<priority>`` : modules may implement their own priority algorithm based on" " their content (example: a forum might assign a priority based on the number" @@ -2382,11 +4580,11 @@ msgid "" "it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:601 +#: ../../content/applications/websites/website/pages/seo.rst:604 msgid "Structured Data Markup" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:603 +#: ../../content/applications/websites/website/pages/seo.rst:606 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 " @@ -2394,13 +4592,13 @@ msgid "" "presented search results." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:608 +#: ../../content/applications/websites/website/pages/seo.rst:611 msgid "" "Google supports a number of rich snippets for content types, including: " "Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:611 +#: ../../content/applications/websites/website/pages/seo.rst:614 msgid "" "Odoo implements micro data as defined in the `schema.org " "<http://schema.org>`__ specification for events, eCommerce products, forum " @@ -2408,29 +4606,29 @@ msgid "" "in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:621 +#: ../../content/applications/websites/website/pages/seo.rst:624 msgid "robots.txt" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:623 +#: ../../content/applications/websites/website/pages/seo.rst:626 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, " +"indexing rules of the ``/robots.txt`` file (allowed robots, sitemap path, " "etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/pages/seo.rst:630 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:630 +#: ../../content/applications/websites/website/pages/seo.rst:633 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:634 +#: ../../content/applications/websites/website/pages/seo.rst:637 msgid "" "You can customize the file *robots* in :ref:`developer mode <developer-" "mode>` from *Settings --> Technical --> User Interface --> Views* (exclude " @@ -2439,682 +4637,230 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:3 -msgid "Unsplash (free images)" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:3 +msgid "How to track your website's traffic in Google Analytics" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:6 -msgid "Generate an Unsplash access key" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:5 +msgid "To follow your website's traffic with Google Analytics:" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:9 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:7 msgid "" -"**As a SaaS user**, you are ready to use Unsplash. You won't need to follow " -"this guide to set up Unsplash information since you will use our own Odoo " -"Unsplash key in a transparent way." +"`Create a Google Analytics account <https://www.google.com/analytics/>`__ if" +" you don't have any." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:13 -msgid "Generate an Unsplash access key for non-Saas users" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:15 -msgid "Create an account on `Unsplash.com <https://unsplash.com/join>`_." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:17 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on **New " -"Application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:23 -msgid "Accept the conditions and click on **Accept terms**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:28 -msgid "" -"You will be prompted to insert an **Application name** and a " -"**Description**. Please prefix your application name by \"**Odoo:** \" so " -"that Unsplash can recognize it as an Odoo instance. Once done, click on " -"**Create application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:35 -msgid "" -"You should be redirected to your application details page. Scroll down a bit" -" to find your **access key**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:42 -msgid "" -"**As a non-SaaS user**, you won't be able to register for a production " -"Unsplash key and will be limited to your test key that has a restriction of " -"50 Unsplash requests per hour." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:46 -msgid "Generate an Unsplash application ID" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:49 -msgid "You should first create and set up your Unsplash application." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:51 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on your newly created " -"Unsplash application under **Your applications**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:57 -msgid "" -"You will be redirected to your application details page. The **application " -"ID** will be visible in your browser's URL. The URL should be something like" -" ``https://unsplash.com/oauth/applications/<application_id>``" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:65 -msgid "" -"**As a non-SaaS user**, you won't be able to register for a production " -"Unsplash key and will be limited to your test key that has a 50 Unsplash " -"requests per hour restriction." -msgstr "" - -#: ../../content/applications/websites/website/publish.rst:5 -msgid "Publish" -msgstr "פרסם" - -#: ../../content/applications/websites/website/publish/multi_website.rst:3 -msgid "Manage Multi Websites" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:8 -msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:12 -msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:20 -msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:40 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:10 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"Go through the creation form and accept the conditions to get the tracking " +"ID." msgstr "" -#: ../../content/applications/websites/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. See :ref:`domain-" -"name/existing`." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:15 +msgid "Copy the tracking ID to insert it in Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:54 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:20 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." +"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " +"turn on Google Analytics and paste the tracking ID. Then save the page." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:62 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:27 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"To make your first steps in Google Analytics, refer to `Google Documentation" +" <https://support.google.com/analytics/answer/1008015?hl=en/>`_." msgstr "" -#: ../../content/applications/websites/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 prompted to create a new page from there." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:3 +msgid "Link trackers" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:76 -msgid "Add features" -msgstr "הוסף תכונות" - -#: ../../content/applications/websites/website/publish/multi_website.rst:78 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:5 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." +"Link Trackers allow you to track your marketing campaigns (emails, banner " +"ads, blog posts, social media posts, affiliate links, etc.). This way, you " +"are able to identify your best traffic sources and make informed decisions " +"about the distribution of your marketing budget." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:82 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:12 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"Go to :menuselection:`Website --> Configuration --> Settings` and activate " +"*Link Trackers*." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:88 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:96 -msgid "languages," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:98 -msgid "domain names," +"View of Website settings page emphasizing the link trackers field in Odoo " +"Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:100 -msgid "social media links," +#: ../../content/applications/websites/website/reporting/link_tracker.rst:19 +msgid "Set up traceable URLs" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:106 -msgid "etc." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:111 -msgid "Manage domain names" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:113 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:21 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." +"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " +"page`. Here, you are able to get a specific tracked URL based on the " +"campaign, medium, and source being used." msgstr "" -#: ../../content/applications/websites/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 +msgid "View of the link tracker fields for Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:129 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:28 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"**URL**: url of the page you want to track (e.g. the home page or a " +"product's page)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:132 -msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:29 +msgid "**Campaign**: context of your link (e.g. a special promotion)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:134 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:30 msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." +"**Medium**: channel used to share (deliver) your link (e.g. an email or a " +"Facebook ad)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:136 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:31 msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:139 -msgid "Customize the visitor experience" +"**Source**: platform where the traffic originates (e.g. Google or Twitter)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:142 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:33 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:152 -msgid "Publish specific content per website" +"Now, click on *Get tracked link* to generate a URL that you can post or send" +" by the source you have decided on." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:155 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:37 +msgid "Follow-up on tracked links" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:39 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:166 -msgid "Products" -msgstr "מוצרים" - -#: ../../content/applications/websites/website/publish/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:170 -msgid "Blogs" -msgstr "בלוגים" - -#: ../../content/applications/websites/website/publish/multi_website.rst:172 -msgid "Slide Channels" +"To look at statistics of your links, go to :menuselection:`Website --> Go to" +" website --> Promote --> Track this page`. Besides being able to see the " +"*Most Clicked* and *Recently Used* links, you can also see complete " +"statistics by clicking on *Stats*, including the number of clicks, and the " +"country of origin for those clicks." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:174 -msgid "Forums" -msgstr "פורומים" - -#: ../../content/applications/websites/website/publish/multi_website.rst:176 -msgid "Events" -msgstr "אירועים" - -#: ../../content/applications/websites/website/publish/multi_website.rst:178 -msgid "Job Positions" -msgstr "משרות" - -#: ../../content/applications/websites/website/publish/multi_website.rst:181 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:185 -msgid "Publish a page in all websites" +"View of the tracked list emphasizing the statistics buttons in Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:187 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:50 +msgid "You can also access the link tracker on *odoo.com/r* via your browser." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:191 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:51 msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." +"Activate the developer mode (:menuselection:`Settings --> Activate the " +"developer mode`) and get access to the *Link Tracker* module and its back-" +"end functionalities." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:197 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:53 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." +"Integrated with :doc:`Google Analytics <google_analytics>`, those trackers " +"allow you to see the number of clicks and visitors to keep you on top of " +"your marketing campaigns." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:202 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:55 msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." +"The integration with the :doc:`CRM " +"</applications/sales/crm/track_leads/prospect_visits>` application allows " +"you to understand where your leads and opportunities are coming from." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:209 -msgid "Multi-companies" +#: ../../content/applications/websites/website/reporting/plausible.rst:3 +msgid "Website analytics with Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." +#: ../../content/applications/websites/website/reporting/plausible.rst:5 +msgid "To follow your website's traffic with Plausible.io:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:217 +#: ../../content/applications/websites/website/reporting/plausible.rst:7 msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." +"`Create a Plausible.io account <https://plausible.io/register>`_ if you " +"don't have any." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:220 +#: ../../content/applications/websites/website/reporting/plausible.rst:8 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." +"`Create your website <https://plausible.io/sites/new>`_ and `Start " +"collecting data` if it is not already done." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:226 +#: ../../content/applications/websites/website/reporting/plausible.rst:10 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." +"Go through the `list of your websites <https://plausible.io/sites>`_ and " +"click on the gear icon." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:232 -msgid "Configure your eCommerce website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Click on cog icon in the list of websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:234 +#: ../../content/applications/websites/website/reporting/plausible.rst:16 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." +"Click on the button :guilabel:`+ New Link` in the tab Visibility to create " +"your Shared links." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:239 -msgid "Products only available on one website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Adding a shared link in the Visibility tab" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:241 +#: ../../content/applications/websites/website/reporting/plausible.rst:22 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." +"Choose a name (and NO password - it is not supported to embed it in Odoo) " +"and click on the button `Create Shared Link`." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:249 -msgid "Products available on *some* websites" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Credentials creation for the new shared link" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:251 +#: ../../content/applications/websites/website/reporting/plausible.rst:29 msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." +"Copy the new Shared Link URL from Plausible.io and paste it into the " +"Settings of Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:254 -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." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Copy the shared link URL from Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:261 -msgid "Pricelists" -msgstr "מחירונים" - -#: ../../content/applications/websites/website/publish/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Paste the shared link URL to Odoo settings" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. See " -":doc:`../../ecommerce/maximizing_revenue/pricing`." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**You are on the Odoo Online Platform**" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:269 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"If you need help. Select a website to make a pricelist only available on " -"this website." +"When you `create your Odoo Online database <https://www.odoo.com/trial>`_, " +"we create it for you on our own server. You don't have anything to do." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:288 -msgid "Customer accounts" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:3 -msgid "Geo IP Installation (On-Premises Database)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:6 -msgid "Installation" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:9 -msgid "" -"Please note that the installation depends on your computer's operating " -"system and distribution. We will assume that a Linux operating system is " -"being used." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:15 -msgid "Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:17 -msgid "" -"Download the `GeoLite2 City database " -"<https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with a" -" file called ``GeoLite2-City.mmdb``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:22 -msgid "Move the file to the folder ``/usr/share/GeoIP/``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:24 -msgid "Restart the server" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:27 -msgid "" -"If you can't/don't want to locate the geoip database in " -"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " -"command line interface. This option takes the absolute path to the GeoIP " -"database file and uses it as the GeoIP database. For example:" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36 -msgid ":doc:`CLI documentation </developer/cli>`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39 -msgid "" -"``GeoIP`` Python library can also be used. However this version is " -"discontinued since January 1. See `GeoLite Legacy databases are now " -"discontinued <https://support.maxmind.com/geolite-legacy-discontinuation-" -"notice/>`_" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:44 -msgid "How To Test GeoIP Geolocation In Your Odoo Website" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:45 -msgid "Go to your website. Open the web page that you want to test ``GeoIP``." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:46 -msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:47 -msgid "Add the following piece of XML in the page :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:53 -msgid "" -"You should end up with a dictionary indicating the location of the IP " -"address." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:59 -msgid "" -"If the curly braces are empty ``{}``, it can be for any of the following " -"reasons :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:61 -msgid "" -"The browsing IP address is the localhost (``127.0.0.1``) or a local area " -"network one (``192.168.*.*``)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:62 -msgid "" -"If a reversed proxy is used, make sure to configure it correctly. See " -":option:`proxy mode <odoo-bin --proxy-mode>`" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:63 -msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:64 -msgid "The GeoIP database was unable to resolve the given IP address" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:3 -msgid "How to translate my website" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:8 -msgid "" -"In addition to creating great modern websites, Odoo gives you the " -"possibility to translate it in different languages." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:12 -msgid "Process" -msgstr "בצע" - -#: ../../content/applications/websites/website/publish/translate.rst:14 -msgid "" -"Once your website is created, you have the opportunity to translate it in as" -" many different languages as you want." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:17 -msgid "You can only translate your website manually, follow the next step." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:19 -msgid "" -"Now go to your website. On the bottom right corner of the page, click on " -"**Add a language**." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:25 -msgid "" -"Choose the language in which you want to translate your website and then " -"click on **Load.**" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:31 -msgid "" -"You will see that Now, next to English there is also French, which means " -"that the page for the translation has been created. You can also see that " -"some of the text has been translated automatically." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**What about the Goal?**" msgstr "" -#: ../../content/applications/websites/website/publish/translate.rst:38 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"To translate the content of the website, click on **Translate** (here " -"**Traduire** since we want to translate the website in French)." +"Odoo pushes out-of-the-box custom events: `Lead Generation` and `Shop`." msgstr "" diff --git a/locale/id/LC_MESSAGES/finance.po b/locale/id/LC_MESSAGES/finance.po index c97d9d95b..937a25e3e 100644 --- a/locale/id/LC_MESSAGES/finance.po +++ b/locale/id/LC_MESSAGES/finance.po @@ -5,23 +5,22 @@ # # Translators: # Wahyu Setiawan <wahyusetiaaa@gmail.com>, 2023 -# Deddy Ddr <deddy.ddr@gmail.com>, 2023 # Edi Santoso <repopamor@gmail.com>, 2023 # Ryanto The <ry.the77@gmail.com>, 2023 # whenwesober, 2023 # arfa simoncelli, 2023 # PAS IRVANUS <ipankbiz@gmail.com>, 2023 -# Martin Trigaux, 2023 # Abe Manyo, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Abe Manyo, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Indonesian (https://app.transifex.com/odoo/teams/41243/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,7 +200,7 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:174 #: ../../content/applications/finance/accounting/get_started/vat_units.rst:77 msgid "Tax report" -msgstr "" +msgstr "Laporan Pajak" #: ../../content/applications/finance/accounting.rst:137 msgid "ES sales list" @@ -544,10 +543,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -571,7 +570,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3887,6 +3886,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterm" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5700,6 +5790,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7198,10 +7289,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7213,101 +7303,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Laporan follow-up" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Laporan follow-up" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7319,11 +7441,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7331,15 +7453,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9494,19 +9616,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9516,23 +9630,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9540,7 +9642,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9552,21 +9654,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Kode komoditas" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9574,24 +9676,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9599,7 +9701,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9608,39 +9710,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9651,96 +9753,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9750,73 +9829,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10020,7 +10099,7 @@ msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:25 msgid "Tax Return Periodicity" -msgstr "" +msgstr "Periodisitas SPT" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:27 msgid "" @@ -10157,7 +10236,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11228,7 +11307,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11403,52 +11482,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11456,46 +11516,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Laporan" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12003,70 +12077,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12097,7 +12171,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manual" @@ -13463,330 +13536,919 @@ msgstr "Pengeluaran" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Pengaturan" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15395,10 +16057,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Laporan" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -16014,7 +16672,7 @@ msgstr "" #: ../../content/applications/finance/fiscal_localizations/chile.rst:48 msgid "Company Settings" -msgstr "" +msgstr "Pengaturan Perusahaan" #: ../../content/applications/finance/fiscal_localizations/chile.rst:50 msgid "" @@ -24244,7 +24902,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24544,7 +25202,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29068,7 +29726,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29291,14 +29948,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29306,7 +29963,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29380,26 +30037,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29411,7 +30078,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29421,7 +30088,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29432,36 +30099,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29473,26 +30184,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29502,21 +30213,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30319,7 +31030,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30333,183 +31044,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30517,7 +31176,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30525,44 +31184,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Kredensial" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/id/LC_MESSAGES/inventory_and_mrp.po b/locale/id/LC_MESSAGES/inventory_and_mrp.po index 3eec406db..48fcd8ccd 100644 --- a/locale/id/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/id/LC_MESSAGES/inventory_and_mrp.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Abe Manyo, 2023\n" "Language-Team: Indonesian (https://app.transifex.com/odoo/teams/41243/id/)\n" @@ -4724,8 +4724,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4762,7 +4762,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4774,8 +4774,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4783,7 +4783,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4860,16 +4860,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4897,8 +4896,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4939,9 +4938,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/id/LC_MESSAGES/sales.po b/locale/id/LC_MESSAGES/sales.po index 27035fd52..b3535f470 100644 --- a/locale/id/LC_MESSAGES/sales.po +++ b/locale/id/LC_MESSAGES/sales.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Indonesian (https://app.transifex.com/odoo/teams/41243/id/)\n" @@ -73,6 +73,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1622,8 +1623,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1632,9 +1634,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1661,41 +1663,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1703,14 +1695,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1721,7 +1713,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1732,37 +1724,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1772,13 +1764,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1786,27 +1778,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1820,31 +1812,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2399,93 +2391,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analitik" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3849,21 +3858,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Faktur" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3875,7 +3884,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3883,23 +3892,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3910,27 +3919,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3940,23 +3949,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3970,7 +3979,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4604,8 +4613,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/id/LC_MESSAGES/websites.po b/locale/id/LC_MESSAGES/websites.po index 074d3d622..cdfc6d52c 100644 --- a/locale/id/LC_MESSAGES/websites.po +++ b/locale/id/LC_MESSAGES/websites.po @@ -4,17 +4,17 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Martin Trigaux, 2023 # Abe Manyo, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Abe Manyo, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Indonesian (https://app.transifex.com/odoo/teams/41243/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -483,7 +483,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -682,7 +682,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1178,6 +1178,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analitik" @@ -1214,7 +1215,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Produk" @@ -1820,11 +1820,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1835,12 +1835,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1848,15 +1848,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1864,11 +1864,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1880,15 +1880,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1900,7 +1900,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2976,435 +2976,286 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Pengaturan" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Tambahkan fitur" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Harga" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Laporan" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blog" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forum" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Acara" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Posisi Kerja" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Daftar Harga" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4780,10 +4631,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Laporan" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/ja/LC_MESSAGES/finance.po b/locale/ja/LC_MESSAGES/finance.po index 1859478a8..d0bf97a63 100644 --- a/locale/ja/LC_MESSAGES/finance.po +++ b/locale/ja/LC_MESSAGES/finance.po @@ -9,18 +9,18 @@ # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2023 # Tim Siu Lai <tl@roomsfor.hk>, 2023 # Noma Yuki, 2023 -# Martin Trigaux, 2023 # Andy Yiu, 2023 # Ryoko Tsuda <ryoko@quartile.co>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Ryoko Tsuda <ryoko@quartile.co>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Japanese (https://app.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -543,10 +543,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -570,7 +570,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3886,6 +3886,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "インコタームズ" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5699,6 +5790,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7197,10 +7289,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7212,101 +7303,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "フォローアップレポート" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "フォローアップレポート" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7318,11 +7441,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7330,15 +7453,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9493,19 +9616,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9515,23 +9630,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9539,7 +9642,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9551,21 +9654,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9573,24 +9676,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9598,7 +9701,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9607,39 +9710,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9650,96 +9753,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9749,73 +9829,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10156,7 +10236,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11227,7 +11307,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11402,52 +11482,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11455,46 +11516,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "レポート" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12002,70 +12077,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12096,7 +12171,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "手動" @@ -13462,330 +13536,919 @@ msgstr "経費" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "セットアップ" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15394,10 +16057,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "レポート" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24243,7 +24902,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24543,7 +25202,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29067,7 +29726,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29290,14 +29948,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29305,7 +29963,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29379,26 +30037,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29410,7 +30078,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29420,7 +30088,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29431,36 +30099,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Adyenアカウント" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29472,26 +30184,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29501,21 +30213,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30318,7 +31030,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30332,183 +31044,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" +msgid "PayPal" msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30516,7 +31176,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30524,44 +31184,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "認証情報" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/ja/LC_MESSAGES/inventory_and_mrp.po b/locale/ja/LC_MESSAGES/inventory_and_mrp.po index a974e17fb..71818913e 100644 --- a/locale/ja/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/ja/LC_MESSAGES/inventory_and_mrp.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Japanese (https://app.transifex.com/odoo/teams/41243/ja/)\n" @@ -4727,8 +4727,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4765,7 +4765,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4777,8 +4777,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4786,7 +4786,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4863,16 +4863,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4900,8 +4899,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4942,9 +4941,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/ja/LC_MESSAGES/sales.po b/locale/ja/LC_MESSAGES/sales.po index 38326316d..757e28f14 100644 --- a/locale/ja/LC_MESSAGES/sales.po +++ b/locale/ja/LC_MESSAGES/sales.po @@ -7,17 +7,17 @@ # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2023 # Noma Yuki, 2023 # Andy Yiu, 2023 -# Martin Trigaux, 2023 # Ryoko Tsuda <ryoko@quartile.co>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Ryoko Tsuda <ryoko@quartile.co>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Japanese (https://app.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,6 +76,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1625,8 +1626,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1635,9 +1637,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1664,41 +1666,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1706,14 +1698,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1724,7 +1716,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1735,37 +1727,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1775,13 +1767,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1789,27 +1781,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1823,31 +1815,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2402,93 +2394,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "分析" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3852,21 +3861,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "請求書" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3878,7 +3887,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3886,23 +3895,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3913,27 +3922,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3943,23 +3952,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3973,7 +3982,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4607,8 +4616,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/ja/LC_MESSAGES/websites.po b/locale/ja/LC_MESSAGES/websites.po index f63d5a962..92ced9a3f 100644 --- a/locale/ja/LC_MESSAGES/websites.po +++ b/locale/ja/LC_MESSAGES/websites.po @@ -4,19 +4,20 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Yoshi Tashiro (Quartile) <tashiro@roomsfor.hk>, 2023 -# Martin Trigaux, 2023 # Andy Yiu, 2023 +# Yoshi Tashiro (Quartile) <tashiro@roomsfor.hk>, 2023 +# Ryoko Tsuda <ryoko@quartile.co>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-23 09:13+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Andy Yiu, 2023\n" -"Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" +"Last-Translator: Martin Trigaux, 2023\n" +"Language-Team: Japanese (https://app.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -61,851 +62,2467 @@ msgid "" "`Odoo Tutorials: eCommerce <https://www.odoo.com/slides/ecommerce-26>`_" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started.rst:5 -msgid "Get started" -msgstr "はじめましょう" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:3 -msgid "How to customize my catalog page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping.rst:5 +msgid "Checkout, payment, and shipping" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:6 -msgid "Product Catalog" -msgstr "商品カタログ" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:3 +msgid "Add to cart" +msgstr "カートに入れる" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:8 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:5 msgid "" -"All your published items show up in your catalog page (or *Shop* page)." +"The :guilabel:`Add to Cart` button can be customized in multiple ways. You " +"can:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:13 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:7 msgid "" -"Most options are available in the *Customize* menu: display attributes, " -"website categories, etc." +"Choose on which page customers go after clicking the 'Add to Cart' button;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:20 -msgid "Highlight a product" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:8 +msgid "Hide the 'Add to Cart' button to prevent sales;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:22 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:9 msgid "" -"Boost the visibility of your star/promoted products: push them to top, make " -"them bigger, add a ribbon that you can edit (Sale, New, etc.). Open the Shop" -" page, switch to Edit mode and click any item to start customizing the grid." +"Add a 'Buy Now' button to skip the cart step and lead customers straight to " +"checkout;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:26 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:10 +msgid "Create additional 'Add to Cart / Buy Now' buttons;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:11 +msgid "Add an 'Order Again' button to the customer portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:14 +msgid ":doc:`checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:17 +msgid "'Add to Cart' action customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:19 msgid "" -"See how to do it: " -"https://www.odoo.com/openerp_website/static/src/video/e-commerce/editing.mp4" +"When customers click on the :guilabel:`Add to Cart` button, the product is " +"added to their cart, and customers remain **by default** on the product's " +"page. However, customers can either immediately be **redirected** to their " +"cart, or given the choice on what to do through a **dialog box**." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:29 -msgid "Quick add to cart" -msgstr "" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:31 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:23 msgid "" -"If your customers buy a lot of items at once, make their process shorter by " -"enabling purchases from the catalog page. To do so, add product description " -"and add to cart button. Turn on the following options in *Customize* menu: " -"Product Description, Add to Cart, List View (to display product description " -"better)." +"To change the default behavior, go to :menuselection:`Website --> " +"Configuration --> Settings`. Under the :guilabel:`Shop - Checkout Process` " +"section, look for :guilabel:`Add to Cart` and select one of the options." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:3 -msgid "How to build a product page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:28 +msgid "" +"If a product has :doc:`optional products " +"<../managing_products/cross_upselling>`, the **dialog box** will always " +"appear." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:5 -msgid "On the website click *New Page* in the top-right corner." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:32 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:20 +msgid ":doc:`../managing_products/catalog`" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:7 -msgid "Then click *New Product* and follow the blinking tips." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:37 +msgid "Replace 'Add to Cart' button by 'Contact Us' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:12 -msgid "Here are the main elements of the Product page:" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:39 +msgid "" +"You can replace the 'Add to Cart' button with a 'Contact Us' button which " +"redirects users to the URL of your choice." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:17 -msgid "Many elements can be made visible from the *Customize* menu." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:43 +msgid "" +"Hiding the :guilabel:`Add to Cart` button is often used by B2B eCommerces " +"that need to restrict purchases only to :ref:`customers with an account " +"<checkout-sign>`, but still want to display an online product catalog for " +"those without." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:22 -msgid "See how to configure your products from links here below." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:47 +msgid "" +"To do so, go to :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products` and tick :guilabel:`Prevent Sale of Zero Priced Product`. " +"This creates a new :guilabel:`Button url` field where you can enter the " +"**redirect URL** to be used. Then, set the price of the product to `0.00` " +"either from the **product's template**, or from a :doc:`pricelist " +"<../../../sales/sales/products_prices/prices/pricing>`." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:26 -msgid ":doc:`../managing_products/variants`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Contact us button on product page" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 -msgid ":doc:`/applications/sales/sales/products_prices/taxes`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:58 +msgid "" +"The 'Contact Us' button and '*Not Available For Sale*' text can both be " +"modified using the **website builder** on the product's page " +"(:menuselection:`Edit --> Customize`) by clicking on them." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 -msgid ":doc:`../maximizing_revenue/cross_selling`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:63 +msgid "Customizable 'Add to Cart' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:29 -msgid ":doc:`../maximizing_revenue/reviews`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:65 +msgid "" +"You can also create a customizable 'Add to Cart' button and link it to a " +"specific product. The **customized button** can be added on any page of the " +"website as an **inner content** building block, and is an *additional* " +"button to the regular :guilabel:`Add to Cart` button." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:30 -msgid ":doc:`../maximizing_revenue/pricing`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:69 +msgid "" +"To add it, go on the :guilabel:`Shop` page of your choice, click " +":menuselection:`Edit --> Blocks` and place the building block. Once placed, " +"you have the following options:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:31 -msgid ":doc:`../../website/optimize/seo`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:72 +msgid "" +":guilabel:`Product`: select the product to link the button with. Selecting a" +" product renders the :guilabel:`Action` field available;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:74 +msgid "" +":guilabel:`Action`: choose if the button should :guilabel:`Add to Cart` or " +":guilabel:`Buy Now` (instant checkout)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:84 +msgid "'Buy Now' button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:86 +msgid "" +"You can enable the 'Buy Now' button to instantly take the customer to " +"**checkout** instead of adding the product to the cart. The :guilabel:`Buy " +"Now` button is an *additional* button and does not replace the " +":guilabel:`Add to Cart` button. To enable it, go to :menuselection:`Website " +"--> Configuration --> Settings --> Shop - Checkout Process` and tick " +":guilabel:`Buy Now`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Buy Now button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:97 +msgid "Re-order from portal" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:99 +msgid "" +"Customers have the possibility to **re-order** items from **previous sales " +"orders** on the customer portal. To do so, go to :menuselection:`Website -->" +" Configuration --> Settings --> Shop - Checkout Process` and enable " +":guilabel:`Re-order From Portal`. Customers can find the :guilabel:`Order " +"Again` button on their **sales order** from the **customer portal**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Re-order button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:3 +msgid "Checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:5 +msgid "" +"You can customize the **checkout steps**, add more content using the " +"**website builder**, and enable additional features such as **express " +"checkout** and **sign in/up at checkout**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:8 +msgid "" +"You can use **building blocks** to add content at any step of the checkout " +"process. To do so, from any **checkout page**, go to :menuselection:`Edit " +"--> Blocks`, and drag and drop **building blocks** to the page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:13 +msgid "" +"Note that content added through building blocks is **specific** to each " +"step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:16 +msgid "Checkout steps" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:19 +msgid "Review order: promo code (and subtotal)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:21 +msgid "" +"If you have enabled :guilabel:`Discounts, Loyalty, & Gift Card` in the " +"settings (:menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`), you can enable the :guilabel:`Promo Code` field " +"(:menuselection:`Edit --> Customize`) from any checkout page. Customers can " +"then redeem gift cards and promotional codes at the :guilabel:`Review Order`" +" step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:26 +msgid "" +"Furthermore, you can display the subtotal with discounts applied by enabling" +" :guilabel:`Show Discount in Subtotal`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Subtotal discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:34 +msgid "Address: B2B fields" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:36 +msgid "" +"Optional :guilabel:`TIN/VAT` and :guilabel:`Company Name` fields can be " +"added to the :guilabel:`Billing Address` form for B2B customers, at the " +":guilabel:`Address` step. To add the fields, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Show B2B fields`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:42 +msgid "Request extra info (additional step)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:44 +msgid "" +"You can request :guilabel:`Extra Info` from the customer by adding an " +":guilabel:`Extra Info` step between the :guilabel:`Address` and " +":guilabel:`Confirm Order` steps. To do so, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Extra Step Option`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:53 +msgid "" +"The :guilabel:`Extra Info` step is an online form linked to the quotation or" +" sales order of the customer. The information added during that step can be " +"found on the quotation or sales order of the customer from the back end, in " +"the **Sales** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:57 +msgid "" +"When enabled, you can remove, add, and modify fields of the form by clicking" +" on :guilabel:`Edit` in the top-right corner, and then clicking on any of " +"the form's fields. All customization options, as well as the :guilabel:`+ " +"Field` button to add new fields, are available at the bottom of the " +":guilabel:`Customize` menu under the :guilabel:`Field` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Online form customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:67 +msgid "Confirm order: terms and conditions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:69 +msgid "" +"You can ask customers to agree to the :guilabel:`Terms & Conditions` in " +"order to confirm their order by enabling :guilabel:`Accept Terms & " +"Conditions` under :menuselection:`Edit --> Customize` on any checkout page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Terms and conditions" +msgstr "諸条件" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:78 +msgid "Express checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:80 +msgid "" +"You can enable a :guilabel:`Buy Now` button on products' pages which " +"instantly takes the customer to the :guilabel:`Confirm Order` checkout page," +" instead of adding the product to the cart. To do so, go to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Checkout " +"Process section` and tick :guilabel:`Buy Now`. Alternatively, the " +":guilabel:`Buy Now` button can also be enabled from any product's page by " +"going :menuselection:`Edit --> Customize`, in the :guilabel:`Cart` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:86 +msgid "" +"The button can be found next to the :guilabel:`Add to Cart` button on the " +"product's page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Buy now (express checkout) button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:93 +msgid ":ref:`Product page design: additional functions <ecommerce-functions>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:98 +msgid "Guest and signed-in checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:100 +msgid "" +"It is possible to introduce a **checkout policy** under which customers can " +"either checkout as **guests** or **signed-in users only**. Customers can " +"also checkout as guest, and **optionally sign up later** in order to track " +"their order, if enabled." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:104 +msgid "" +"To select a policy, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shop - Checkout Process`. You can choose between:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:107 +msgid "" +":guilabel:`Optional`: allows guests to checkout and later register from the " +"**order confirmation** email to track their order;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:109 +msgid "" +":guilabel:`Disabled (buy as guest)`: customers can only checkout as guests;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:110 +msgid "" +":guilabel:`Mandatory (no guest checkout)`: customers can only checkout if " +"they have signed-in." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:113 +msgid ":doc:`../ecommerce_management/customer_accounts`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:114 +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:24 +msgid ":doc:`/applications/general/users/portal`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:117 +msgid "B2B access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:119 +msgid "" +"If you wish to restrict checkout only to **selected B2B customers**, enable " +":guilabel:`Mandatory (no guest checkout)` and go to :menuselection:`Website " +"--> eCommerce --> Customers`. Select the customer you wish to **grant access" +" to**, click :menuselection:`Action --> Grant portal access`, and click " +":guilabel:`Grant Access`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:125 +msgid "" +"Settings are **website-specific**, which means you can set up a B2C website " +"allowing **guest** checkout, and another for B2B customers with **mandatory " +"sign-in**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:129 +msgid "" +"Users can only have one portal access per **email**. They *cannot* be " +"granted access to two different portals with the same **email address**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:133 +msgid "Shared customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:135 +msgid "" +"If you enable :guilabel:`Shared Customer Accounts` under " +":menuselection:`Website --> Configuration --> Settings --> Privacy section`," +" you can allow or disallow access to *all* websites for one same account." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:3 +msgid "Payment providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:5 +msgid "" +"Odoo supports a multitude of online :doc:`payment providers " +"</applications/finance/payment_providers>` for your website, allowing your " +"customers to pay with their preferred payment methods." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:10 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:55 +msgid ":doc:`/applications/sales/sales/products_prices/ewallets_giftcards`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:11 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:12 +msgid ":doc:`../checkout_payment_shipping/checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:10 +msgid "Configuration" +msgstr "コンフィグレーション" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:16 +msgid "" +"To set up payment providers on the eCommerce app, go to " +":menuselection:`Website --> Configuration --> Payment Providers`. From here," +" :guilabel:`Activate` the payment providers you wish to have available on " +"your shop, and configure them according to your needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:20 +msgid "" +"Alternatively, you can access **payment providers** via " +":menuselection:`Website --> Configuration --> Settings`. In the " +":guilabel:`Shop - Payment` section, you can :guilabel:`Configure SEPA Direct" +" Debit` if you wish to use it, as well as :guilabel:`View other providers`. " +"If you use the :guilabel:`Authorize.net` payment provider, the :ref:`Payment" +" Capture Method <payment_providers/features/manual_capture>` can be " +"configured in that same menu." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:27 +msgid "" +"If you are using :doc:`/applications/finance/payment_providers/paypal`, you " +"can also enable and configure it here." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:31 +msgid "Checkout payment options" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:33 +msgid "" +"Once activated, customers can choose the payment provider of their choice " +"during the **checkout process**, at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Payment provider selection at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:41 +msgid "eWallets and gift cards" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:43 +msgid "" +"When checking out, customers can pay with an eWallet or gift cards. To " +"enable these, go to :menuselection:`Website --> Configuration --> Settings`," +" and in the :guilabel:`Shop-Products` section, enable " +":menuselection:`Discounts, Loyalty & Gift Card`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:47 +msgid "" +"Once enabled, customers can enter their gift card **code** or pay with their" +" eWallet at the checkout step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Enter gift card code to process checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:3 +msgid "Shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:5 +msgid "" +"Depending on your shipping strategy, you have the choice to either use your " +":ref:`own shipping methods <ecommerce-own-shipping>`, or use an integration " +"with an :ref:`existing shipping provider <ecommerce-shipping-providers>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:15 +msgid "Own shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:17 +msgid "" +"You can create your own custom shipping methods and define rules to compute " +"shipping costs. To do so, go to :menuselection:`Website --> Configuration " +"--> Shipping Methods`, and either select an **existing** shipping method, or" +" :guilabel:`Create` one. When creating a shipping method, you can choose " +"between :doc:`Fixed Price " +"</applications/inventory_and_mrp/inventory/shipping/setup/delivery_method>`," +" :doc:`Based on Rules " +"</applications/inventory_and_mrp/inventory/shipping/setup/delivery_method>`," +" and :guilabel:`Pickup in store`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:26 +msgid "Pickup in store" +msgstr "店頭受取" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:28 +msgid "" +":guilabel:`Pickup in store` must first be **enabled** in the settings " +"(:menuselection:`Website --> Configuration --> Settings --> Shipping " +"section)` by checking :guilabel:`On Site Payments & Picking`. Once enabled, " +"you can select and :guilabel:`Customize Pickup Sites`. :guilabel:`Picking " +"sites` can be made **website-specific**, but are by default available for " +"*all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:34 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/delivery_method`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:35 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:83 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/invoicing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:36 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:85 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/multipack`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:37 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/cancel`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:42 +msgid "Shipping providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:44 +msgid "" +"Another solution is to use one of the integrations with an existing shipping" +" provider. The advantage of using an integration is that delivery costs are " +"automatically computed based on each order as well as generating shipping " +"labels." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:49 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:50 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:51 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/dhl_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:52 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:84 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/labels`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:55 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:204 +msgid "Website availability" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:57 +msgid "" +"Shipping methods can be made available on **specific** websites *only*, if " +"desired. To do so, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shipping Methods`, and select the desired **shipping method**. " +"In the :guilabel:`Website` field, set the website you want the shipping " +"method to be restrained to. Leave the field **empty** for the method to be " +"available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:63 +msgid "Delivery method at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:65 +msgid "" +"Customers can choose the shipping method at the end of the checkout process," +" at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst-1 +msgid "Delivery method choice at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management.rst:5 +msgid "eCommerce management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 +msgid "Customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:5 +msgid "" +"Having customer accounts on an eCommerce allows customers to access all " +"their documents from a single place. To access their account, customers must" +" be **logged-in** on the eCommerce website, click on their **username** in " +"the top-right corner of the screen, and click :guilabel:`My Account`. From " +"there, customers can access their :guilabel:`quotations`, " +":guilabel:`orders`, :guilabel:`invoices`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Customer account log-in" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:16 +msgid "" +"Customers can only have an account if the :ref:`sign in/up at checkout " +"<checkout-sign>` option allows for accounts creation." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:20 +msgid "" +"Similarly to the rest of the website, the customer account page can be " +"customized with **content blocks** and other features through the **website " +"builder**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:27 +msgid "Access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:29 +msgid "" +"It is possible to allow or restrict the documents to which customers have " +"access through the website builder. Log in your **own** account with your " +"Odoo database credentials, and go to :menuselection:`Edit --> Customize`. " +"From the website builder menu, enable or disable the documents customers can" +" have access to." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Documents to which customers have access to from their account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:39 +msgid "Multi-website account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:41 +msgid "" +"If you own multiple websites, you can make customer accounts available " +"across **all** websites. Then, the customer only needs one account. To do " +"so, go to :menuselection:`Website --> Configuration --> Settings --> Privacy" +" section`, and enable :guilabel:`Shared Customer Accounts`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:3 +msgid "Customer interaction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:5 +msgid "" +"Odoo offers many ways to interact with customers and for customers to " +"interact with your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:10 +msgid "Product reviews" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:12 +msgid "" +"Customers can give a rating to your products. This is a great way to promote" +" your products or services since reviews can influence purchase processes. " +"To activate the **rating** feature, from your **shop page**, select a " +"product, go to :menuselection:`Edit --> Customize` and enable " +":guilabel:`Rating`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Rating of a product on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:22 +msgid "" +"Only portal users which purchased the product or service can leave ratings." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:25 +msgid "" +"Customer reviews can be hidden by clicking the :guilabel:`Visible` button " +"next to a published review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:29 +msgid "Live chat" +msgstr "ライブチャット" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:31 +msgid "" +"A chatbot is available and can simulate a human-like conversation with " +"website visitors via text messages in a chat box." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:35 +msgid ":doc:`../../livechat`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:36 +msgid ":doc:`../../livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:37 +msgid ":doc:`../../livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:42 +msgid "Contact forms" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:45 +msgid "Helpdesk" +msgstr "ヘルプデスク" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:47 +msgid "" +"Customers may need support after purchasing a product or subscribing to a " +"service. It is possible to create a **contact form**, which, when fulfilled," +" automatically creates a new ticket for your **support team**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Contact form to submit a ticket to the support team" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:55 +msgid "" +"To add a contact form, **create** a new page (:menuselection:`+ New --> " +"Page`) if necessary, and drag and drop a :guilabel:`Form` block from the " +":guilabel:`Dynamic Content` section onto the page. Once placed, click on the" +" form (while in :guilabel:`Edit` mode), and in the :guilabel:`Action` field," +" select :guilabel:`Create a Ticket`. You can then select to which " +":guilabel:`Helpdesk team` the ticket should be assigned." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Action field to create a task upon submitting a form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:66 +msgid "Contact us" +msgstr "お問い合わせ" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:68 +msgid "" +"A 'Contact Us' page makes it easier for customers and prospects to contact " +"your company and get in touch." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:71 +msgid "" +"To have a 'Contact Us' page, create a new page (:menuselection:`+ New --> " +"Page`) if necessary, and click on :menuselection:`Edit --> Customize`. Then," +" drag and drop a :guilabel:`Form` block onto the page. Select the form and " +"define the action to be performed when submitted in the :guilabel:`Action` " +"field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:76 +msgid "" +"When clicking on a field, or when adding a new field (:guilabel:`+ Field`), " +"you can select its :guilabel:`Type`. This enables different options, such as" +" :guilabel:`Multiple Checkboxes`, which customers can use to indicate the " +"services they are interested in, for example." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Tags to be selected on the 'Contact Us' form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "'Checkboxes' configuration settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:89 +msgid "Newsletter" +msgstr "ニュースレター" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:91 +msgid "" +"Customers can get updates on your eCommerce activities by subscribing to a " +"newsletter. Visitors subscribing to the newsletter are automatically added " +"to the mailing list of the **Email Marketing** application. You can either " +"choose a newsletter **block**, a newsletter **popup**, or both." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:95 +msgid "" +"**Popup**: prompts up a newsletter box when visitors scroll down the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:96 +msgid "" +"**Block**: displays a field on the page where customers can sign up by " +"entering their email." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:98 +msgid "" +"The newsletter **block** can be configured according to different " +":guilabel:`Templates`. To do so, click the **block** while in " +":menuselection:`Edit --> Customize`, and select a :guilabel:`Template` in " +"the :guilabel:`Newsletter Block` section. There are **three** templates " +"available:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:102 +msgid "" +":guilabel:`Email Subscription`: visitors can sign up by email to the " +"newsletter, without any choice to the content. The content is defined in " +":menuselection:`Edit --> Customize` in the :guilabel:`Newsletter` field;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:105 +msgid "" +":guilabel:`SMS Subscription`: is the same as :guilabel:`Email Subscription`," +" but by SMS;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:106 +msgid "" +":guilabel:`Form Subscription`: allows adding several fields, as well as a " +"checkbox for the visitor to agree to the **GDPR policy** of your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Form subscription configuration and settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:114 +msgid "" +"Alternatively, you can select :guilabel:`Subscribe to Newsletter` as " +":guilabel:`Action` when creating a :ref:`contact form <contact-form>`, " +"allowing for the same level of customization. Make sure to add a checkbox " +"stating visitors agree to be added to the mailing list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:3 +msgid "Order handling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:5 +msgid "" +"When a customer orders on your eCommerce, there are **three** record types " +"required to be handle in Odoo:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:8 +msgid ":ref:`Sales orders <handling/sales>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:9 +msgid ":ref:`Delivery orders <handling/delivery>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:10 +msgid ":ref:`Invoices & legal requirements <handling/legal>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:15 +msgid "Sales orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:18 +msgid "Order and payment status" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:20 +msgid "" +"The first step when a customer adds a product to his cart is the creation of" +" a quotation. Orders can be managed either from the **Website** or " +":doc:`Sales </applications/sales/sales>` app. eCommerce orders can " +"automatically be assigned to a specific sales team by going to " +":menuselection:`Website --> Configuration --> Settings`. In the **Shop - " +"Checkout Process** section, select a :guilabel:`Sales Team` or " +":guilabel:`Salesperson` to handle eCommerce orders." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Assignment of online orders to a sales team or salesperson" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:30 +msgid "" +"Orders can be found under :menuselection:`Website --> eCommerce --> " +"Orders/Unpaid Orders`. Each order goes through a different status:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:33 +msgid "" +"**Quotation**: a new product is added to the cart, but the customer has " +"*not* gone through the checkout process yet;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:35 +msgid "" +"**Quotation sent**: the customer has gone through the checkout process and " +"confirmed the order, but the payment is not yet confirmed;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:37 +msgid "" +"**Order**: the customer has gone through the checkout process, confirmed the" +" order, and the payment is received." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Statuses of eCommerce orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:45 +msgid "Abandoned cart" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:47 +msgid "" +"An **abandoned cart** represents an order for which the customer did **not " +"finish** the checkout confirmation process. For these orders, it is possible" +" to send an **email reminder** to the customer automatically. To enable that" +" feature, go to :menuselection:`Website --> Configuration --> Settings` and " +"in the :guilabel:`Email & Marketing` section, enable " +":guilabel:`Automatically send abandoned checkout emails`. Once enabled, you " +"can set the **time-lapse** after which the email is sent and customize the " +"**email template** used." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:55 +msgid "" +"For abandoned cart emails, the customer must either have entered their " +"contact details during the checkout process; or be logged-in when they added" +" the product to their cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:61 +msgid "Delivery orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:64 +msgid "Delivery flow" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:66 +msgid "" +"Once a quotation has been confirmed, a delivery order is automatically " +"created. The next step is to process this delivery." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:69 +msgid "" +"Packing eCommerce orders usually requires picking the product, preparing the" +" packaging, printing the shipping label(s) and shipping to the customer. " +"Depending on the number of orders, strategy, or resources, those steps can " +"be considered as one or multiple actions in Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:73 +msgid "" +"An automatic email can be sent to the customer when the transfer status in " +"Odoo is “done”. To do so, enable the feature in the settings of the " +":doc:`Inventory </applications/inventory_and_mrp/inventory>` app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:78 +msgid "" +"If customers are allowed to pay when picking up their order in stores or by " +"wire transfer, the quotation is **not** be confirmed and the stock is " +"**not** be reserved. Orders must be confirmed manually to reserve products " +"in stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:88 +msgid "Returns and refunds" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:90 +msgid "" +"Customers can only return an order through an online form. It may not be " +"possible to return products depending on the return strategy or type of " +"product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:93 +msgid "" +"Full refunds can be directly sent to customers from within the order " +"interface. A refund-compatible payment provider needs to be enabled first." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:97 +msgid ":doc:`/applications/sales/sales/products_prices/returns`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:98 +msgid ":doc:`/applications/services/helpdesk/advanced/after_sales`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:99 +msgid ":doc:`/applications/finance/payment_providers`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:104 +msgid "Invoice and legal requirements" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:106 +msgid "" +"The final step of an ecommerce order is to generate the invoice and send it " +"to the customer. Depending on the type of business (B2B or B2C), an invoice " +"can either be generated automatically (B2B) or on demand of the customer " +"(B2C). This process can be automated if (and when) the online payment is " +":ref:`confirmed <handling/sales>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:111 +msgid "" +"To automate invoicing, go to :menuselection:`Website --> Configuration --> " +"Settings` and in the :guilabel:`Invoicing` section, enable " +":guilabel:`Automatic Invoice`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:3 +msgid "Performance monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:5 +msgid "" +"Odoo integrates a variety of tools to analyze and improve the performance of" +" your eCommerce website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:9 +msgid "Performance analysis tools" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:12 +msgid "Data monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:14 +msgid "" +"**Website** allows monitoring and analysis of the sales performance of your " +"eCommerce. To access the **reporting view**, go to :menuselection:`Website " +"--> Reporting`. This dashboard helps you monitor everything related to " +"sales, such as sales performance per product, category, day, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst-1 +msgid "Performance reporting of eCommerce" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:22 +msgid "" +"By clicking :guilabel:`Measures`, you can select the type of measurement " +"used, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:24 +msgid ":guilabel:`Margin`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:25 +msgid ":guilabel:`Qty Invoiced`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:26 +msgid ":guilabel:`Untaxed Total`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:27 +msgid ":guilabel:`Volume`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:28 +msgid "..." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:30 +msgid "" +"Other options include **multiple views (Pivot, etc.), comparison** by " +"periods or years, and directly :guilabel:`insert in spreadsheet`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 +msgid "Analytics" +msgstr "分析" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:36 +msgid "" +"It is possible to link your Odoo website with Google Analytics. To do so, go" +" to :menuselection:`Website --> Configuration --> Settings` and scroll to " +"the :guilabel:`SEO` section. Then, enter your **ID** in the " +":guilabel:`Measurement ID` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:40 +msgid "" +"If you are still using **Universal Analytics**, it can directly be added by " +"injecting the code in the HTML header and body using the website builder. " +"All metrics from Google Analytics and Universal Analytics can be seen " +"directly within Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:44 +msgid "" +"Alternatively, Odoo offers the possibility to use another service, " +"**Plausible.io**. Plausible.io is a simple and privacy-friendly alternative " +"to Google Analytics. Everything can be managed directly in Odoo, there is no" +" need to visit Plausible.io's website to access your metrics." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:49 +msgid ":doc:`/applications/websites/website/reporting/google_analytics`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:50 +msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -msgid "Manage my products" +msgid "Products" +msgstr "商品" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:3 +msgid "Catalog" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:3 -msgid "How to display several images per product" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:5 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:5 msgid "" -"By default your product web page displays the main image of your product " -"only. If you like to show your products under several angles, you can turn " -"the image into a carrousel." +"The eCommerce catalog is the equivalent of your physical store shelves: it " +"allows customers to see what you have to offer. Clear categories, available " +"options, sorting, and navigation threads help you structure it efficiently." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:11 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:10 +msgid "Categorize the product catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:12 msgid "" -"Check *Several images per product* in :menuselection:`Website Admin --> " -"Configuration --> Settings`." +"In Odoo, there is a **specific category model** for your eCommerce. Using " +"eCommerce categories for your products allows you to add a navigation menu " +"on your eCommerce page. Visitors can then use it to view all products under " +"the category they select." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:13 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:16 msgid "" -"Open a product detail form and upload images from *Images* tab. Hit *Create*" -" in Edit mode to get the upload wizard." +"To do so, go to :menuselection:`Website --> eCommerce --> Products`, select " +"the product you wish to modify, click on the :guilabel:`Sales` tab, and " +"select the :guilabel:`Categories` you want under :guilabel:`eCommerce Shop`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:19 -msgid "Such extra image are common to all the product variants (if any)." +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "eCommerce categories under the \"Sales\" tab" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:25 +msgid "A single product can appear under multiple eCommerce categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:27 +msgid "" +"When your product's categories are configured, go to your **main shop page**" +" and click on :menuselection:`Edit --> Customize tab`. In the " +":guilabel:`Categories` option, you can either enable a menu on the " +":guilabel:`Left`, on the :guilabel:`Top`, or both. If you select the " +":guilabel:`Left` category, the option :guilabel:`Collapsable Category " +"Recursive` appears and allows to render the :guilabel:`Left` category menu " +"collapsable." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Categories options for your eCommerce website" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:38 +msgid ":doc:`products`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:43 +msgid "Browsing" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:45 +msgid "" +"The eCommerce category is the first tool to organize and split your " +"products. However, if you need an extra level of categorization in your " +"catalog, you can activate various **filters** such as attributes or sort-by " +"search." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:50 +msgid "Attributes" +msgstr "属性" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:52 +msgid "" +"Attributes refer to **characteristics** of a product, such as **color** or " +"**material**, whereas variants are the different combinations of attributes." +" :guilabel:`Attributes and Variants` can be found under " +":menuselection:`Website --> eCommerce --> Products`, select your product, " +"and :guilabel:`Attributes & Variants` tab." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:58 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:15 +msgid ":doc:`../../../sales/sales/products_prices/products/variants`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Attributes and variants of your product" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:64 +msgid "" +"To enable **attribute filtering**, go to your **main shop page**, click on " +":menuselection:`Edit --> Customize tab` and select either :guilabel:`Left`, " +":guilabel:`Top`, or both. Additionally, you can also enable :guilabel:`Price" +" Filtering` to enable price filters." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:69 +msgid "" +":guilabel:`Price Filter` works independently from **attributes** and, " +"therefore, can be enabled on its own if desired." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:73 +msgid "" +"You can use **attribute filters** even if you do not work with product " +"variants. When adding attributes to your products, make sure only to specify" +" *one* value per attribute. Odoo does not create variants if no combination " +"is possible." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:78 +msgid "Sort-by search" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:80 +msgid "" +"It is possible to allow the user to manually **sort the catalog** using the " +"search bar. From your **main shop page**, click on :menuselection:`Edit --> " +"Customize tab`; you can enable or disable the :guilabel:`Sort-By` option as " +"well as the :guilabel:`Layout` button. You can also select the " +":guilabel:`Default Sort` of the :guilabel:`Sort-By` button. The default sort" +" applies to *all* categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:86 +msgid "The **sorting** options are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:88 +msgid "Featured" +msgstr "注目" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:89 +msgid "Newest Arrivals" +msgstr "最新到着" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:90 +msgid "Name (A-Z)" +msgstr "名称 (A-Z)" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:91 +msgid "Price - Low to High" +msgstr "価格 - 昇順" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:92 +msgid "Price - High to Low" +msgstr "価格 - 降順" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:94 +msgid "" +"In addition, you can **manually edit** the catalog's order of a product by " +"going to **the main shop page** and clicking on the product. Under the " +":guilabel:`Product` section of the :guilabel:`Customize` section, you can " +"rearrange the order by clicking on the arrows. `<<` `>>` move the product to" +" the **extreme** right or left, and `<` `>` move the product by **one** row " +"to the right or left. It is also possible to change the catalog's order of " +"products in :menuselection:`Website --> eCommerce --> Products` and drag-" +"and-dropping the products within the list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Product rearrangement in the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:107 +msgid "Page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:110 +msgid "Category page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:112 +msgid "" +"You can customize the layout of the category page using the website builder." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:115 +msgid "" +"Editing the layout of the category page is global; editing one category " +"layout affects *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:118 +msgid "" +"To do so, go on to your :menuselection:`Category page --> Edit --> " +"Customize`. Here, you can choose the layout, the number of columns to " +"display the products, etc. The :guilabel:`Product Description` button makes " +"the product description visible from the category page, underneath the " +"product picture." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Layout options of the category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:127 +msgid "" +"You can choose the size of the grid, but be aware that displaying too many " +"products may affect performance and page loading speed." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:131 +msgid "Product highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:133 +msgid "" +"You can highlight products to make them more visible on the category or " +"product page. On the page of your choice, go to :menuselection:`Edit --> " +"Customize` and click on the product to highlight. In the :guilabel:`Product`" +" section, you can choose the size of the product image by clicking on the " +"grid, and you can also add a **ribbon** or :guilabel:`Badge`. This displays " +"a banner across the product's image, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:139 +msgid "Sale;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:140 +msgid "Sold out;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:141 +msgid "Out of stock;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:142 +msgid "New." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:144 +msgid "" +"Alternatively, you can activate the :doc:`developer mode " +"<../../../general/developer_mode>` on the **product's template**, and under " +"the :guilabel:`Sales` tab, change or create the ribbon from the " +":guilabel:`Ribbon` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:149 +msgid "" +"The :doc:`developer mode <../../../general/developer_mode>` is only intended" +" for experienced users who wish to have access to advanced tools. Using the " +"**developer mode** is *not* recommended for regular users." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Ribbon highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:158 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:160 +msgid "" +"You can access and enable additional feature buttons such as **add to " +"cart**, **comparison list**, or a **wishlist**. To do so, go to your **main " +"shop page**, and at the end of the :guilabel:`Products Page` category, click" +" on the feature buttons you wish to use. All three buttons appear when " +"hovering the mouse over a product's image." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:165 +msgid "" +":guilabel:`Add to Cart`: adds a button to :doc:`add the product to the cart " +"<../checkout_payment_shipping/cart>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:167 +msgid "" +":guilabel:`Comparison List`: adds a button to **compare** products based on " +"their price, variant, etc.;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:169 +msgid "" +":guilabel:`Wishlist Button`: adds a button to **wishlist** the product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Feature buttons for add to cart, comparison list, and wishlist" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Appearance of buttons when hoovering over the mouse" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:180 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:112 +msgid "Add content" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:182 +msgid "" +"You can use **building blocks** to add content on the category page, with a " +"variety of blocks ranging from :guilabel:`Structure` to :guilabel:`Dynamic " +"Content`. Specific areas are defined to use blocks are defined and " +"highlighted on the page when **dragging-and-dropping** a block." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Building blocks areas" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:190 +msgid "" +"If you drop a building block **on top** of the product list, it creates a " +"new category header specific to *that* category." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:192 +msgid "" +"If you drop a building **on the top** or **bottom** of the page, it becomes " +"visible on *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:196 +msgid "" +"Adding content to an eCommerce category page is beneficial in terms of " +"**SEO** strategy. Using **keywords** linked to the products or the eCommerce" +" categories improves organic traffic. Additionally, each category has its " +"own specific URL that can be pointed to and is indexed by search engines." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:3 +msgid "Cross-selling and upselling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:5 +msgid "" +"Any sales process is an opportunity to maximize revenues. **Cross-selling " +"and upselling** are sales techniques consisting in selling customers " +"additional or more expensive products and services than what they were " +"originally shopping for. It is a great way to maximize the value of each one" +" of your customers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:10 +msgid "**Cross-selling** can be done via **two** features:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:12 +msgid "" +":ref:`Optional products <cross_upselling/optional>` upon **adding to cart**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:13 +msgid "" +":ref:`Accessory products <cross_upselling/accessory>` on the **checkout " +"page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:15 +msgid "" +"**Upselling** is only done via :ref:`alternative products " +"<cross_upselling/alternative>` on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:19 +msgid ":doc:`catalog`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:22 +msgid "Cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:27 +msgid "Optional products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:29 +msgid "" +"**Optional products** are suggested when customers click :guilabel:`Add to " +"cart`, either from the **product page** or **catalog page**. Upon clicking, " +"a pop-up window opens with the **optional products** displayed in the " +":guilabel:`Available Options` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Optional products cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:37 +msgid "" +"To enable **optional products** go to :menuselection:`Website --> eCommerce " +"--> Products`, select a product, go to the :guilabel:`Sales` tab, and enter " +"the products you wish to feature in the :guilabel:`Optional Products` field." +" Optional products are **linked** to the product(s) they are set up with on " +"the **product template**. They only appear when that product is added to the" +" cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:43 +msgid "" +"You can also access the :guilabel:`Sales` tab of the **product template** by" +" selecting a product on your **main shop page** and clicking " +":guilabel:`Product` in the top-right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:49 +msgid "Accessory products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:51 +msgid "" +"**Accessory products** are displayed in the :guilabel:`Suggested " +"Accessories` section before processing to checkout at the :guilabel:`Review " +"Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Suggested accessories at checkout during cart review" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:58 +msgid "" +"To enable **accessory products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Accessory " +"Products` field. Suggested accessory products are **linked** to the " +"product(s) they are set up with on the **product template**. They only " +"appear when that product is at the checkout process review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:65 +msgid "Upselling" +msgstr "アップセル対象" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:70 +msgid "Alternative products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:72 +msgid "" +"**Alternative products** are suggested on the **product page** and usually " +"incentivize customers to buy a more expensive variant or product than the " +"one they were initially shopping for." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Alternative products on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:79 +msgid "" +"To enable **alternative products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Alternative " +"Products` field. Then, go to the related **product page** by clicking " +":guilabel:`Go To Website`, and click :menuselection:`Edit`. Stay on the " +":guilabel:`Blocks` tab, and scroll down to the :guilabel:`Dynamic Content` " +"section. Then, drag and drop the :guilabel:`Products` building block " +"anywhere on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:86 +msgid "" +"When placed, in :guilabel:`Edit` mode, click the **block** to access various" +" settings for that :guilabel:`Products` building block. In the " +":guilabel:`Filter` field, select :guilabel:`Alternative Products`. You can " +"configure several additional settings, such as how many elements are " +"displayed (:guilabel:`Fetched Elements`), the :guilabel:`Template` used, " +"etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:3 +msgid "Price management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:5 +msgid "" +"Odoo offers multiple options to select the price displayed on your website, " +"as well as condition-specific prices based on set criteria." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:9 +msgid "Taxes" +msgstr "税金" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:12 +msgid "Tax configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:14 +msgid "" +"To add a tax on a product, you can either set a tax in the " +":guilabel:`Customer Taxes` field of the **product template** or use " +":doc:`fiscal positions " +"</applications/finance/accounting/taxes/fiscal_positions>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 +msgid ":doc:`/applications/finance/accounting/taxes`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 +msgid "Tax display" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:27 +msgid "" +"Choosing the displayed price tax usually depends on a country's regulations " +"or the type of customers **(B2B vs. B2C)**. To select the type of price " +"displayed, go to :menuselection:`Website --> Configuration --> Settings`, " +"scroll down to the :guilabel:`Shop - Products` category, and select " +":guilabel:`Tax Excluded` or :guilabel:`Tax Included`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:32 +msgid "" +":guilabel:`Tax Excluded`: the price displayed on the website is **tax-" +"excluded**, and the tax is computed at the cart-review step;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:34 +msgid "" +":guilabel:`Tax Included`: the price displayed on the website is **tax-" +"included**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:37 +msgid "" +"This setting is **global**, and the tax-display type is the same for (all " +"of) your website(s). It is, therefore, not possible to select different tax " +"displays for different websites. This may be a significant point of " +"consideration when implementing a database with multiple ecommerce websites " +"aimed at varying customer types (i.e., B2B and B2C)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:42 +msgid "" +"You can choose to display the type of pricing next to the product price by " +"going to :menuselection:`Website --> Site --> Homepage --> Shop`, selecting " +"a product, and then :menuselection:`Edit --> Customize tab` and enabling " +":guilabel:`Tax Indication`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Tax type displayed on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 +msgid "Price per unit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:56 +msgid "" +"It is possible to display a :doc:`price per unit " +"</applications/inventory_and_mrp/inventory/management/products/uom>` on the " +"product page. To do that, go to :menuselection:`Website --> Configuration " +"--> Settings` and enable :guilabel:`Product Reference Price` under the " +":guilabel:`Shop - Products` section. When enabled, ensure an amount is set " +"in the :guilabel:`Base Unit Count` field of the **product template**, and in" +" the :guilabel:`Sales Price`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product template" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:67 +msgid "" +"The price per unit of measure can be found above the :guilabel:`Add to Cart`" +" button on the product page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:75 +msgid "" +"Pay attention that having the price per unit may be **mandatory** in some " +"countries." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:78 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +msgid "Price configuration: pricelists" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 +msgid "" +"Pricelists are the primary tool to manage prices on your eCommerce. They " +"allow you to define website-specific prices - different from the price on " +"the product template - based on the **country group**, **currency**, " +"**minimum quantity**, **period**, or **variant**. You can create as many " +"pricelists as needed, but it is mandatory to have at least one pricelist " +"configured per website. If no custom pricelists are added, Odoo defaults to " +"the **Public Pricelist** for all websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 +msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 +msgid "" +"Pricelists can be found under :menuselection:`Website --> eCommerce --> " +"Pricelists`, but must first be activated. For that, head to " +":menuselection:`Website --> Configuration --> Settings` and scroll down to " +"the :guilabel:`Shop - Products` section. There, you can find two options:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 +msgid ":guilabel:`Multiple prices per product`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +msgid ":guilabel:`Advanced price rules (discounts, formulas)`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 +msgid "" +"The **first** option allows you to set different prices per customer " +"*segment*, i.e., registered customers, gold customers, regular customers, " +"etc. The **second** option allows you to set *price change* rules such as " +"**discounts**, **margins**, **roundings**, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +msgid "Foreign currency" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 +msgid "" +"If you are selling in **multiple currencies** and have pricelists in foreign" +" currencies, customers can select their corresponding pricelist anywhere on " +"the :guilabel:`Shop` page from the drop-down menu next to the **search " +"bar**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Pricelists selection" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 +msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +msgid "Permanent discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 +msgid "" +"If you have permanently reduced the price of a product, a popular means to " +"attract customers is the **strikethrough** strategy. The strategy consists " +"in displaying the previous price crossed out and the **new discounted " +"price** next to it." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Price strikethrough" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 +msgid "" +"To display a 'striked' price, enable the :guilabel:`Comparison Price` option" +" under :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products category`. Then, head to the product's template " +"(:menuselection:`Website --> eCommerce --> Products`), and in the " +":guilabel:`Compare to Price` field, enter the **new** price." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:3 +msgid "Product management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:5 +msgid "" +"Odoo allows you to create, import, and manage your products' pages all " +"within the **Website** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:8 +msgid "Add products to the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:10 +msgid "To add a product to your catalog, you can either do it in:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:12 +msgid "" +"From anywhere on your website, click :menuselection:`+ New --> Product`. " +"Enter the name of your product, and :guilabel:`Save`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:14 +msgid ":menuselection:`Website --> eCommerce --> Products --> Create`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:15 +msgid "" +"or by :ref:`importing data <import-data>` using XLSX or CSV files. To do so," +" go to :menuselection:`Website --> eCommerce --> Products`. Click on " +":guilabel:`Favorites` and :ref:`Import records <import-data>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:21 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 +msgid ":doc:`../../../sales/sales/products_prices/products/import`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:22 +msgid ":doc:`Product-related documentation <../../../sales/sales>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:25 +msgid "Publish" +msgstr "公開" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:27 +msgid "" +"Upon creation, products are defaulted as :guilabel:`Unpublished` in your " +"eCommerce catalog. To make a product visible to visitors, go to " +":menuselection:`Website --> Site --> Homepage`, click on your **main shop** " +"page, select the product, and enable it as :guilabel:`Published` in the top-" +"right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:33 +msgid "" +"To publish **large batches** of products, the most convenient fashion is to " +"go to :menuselection:`Website --> eCommerce --> Products`. Here, remove the " +":guilabel:`Published` filter by clicking on the :guilabel:`x` right to it, " +"and then select the :guilabel:`List` view. Next, click the " +":guilabel:`dropdown toggle` button (located right below the :guilabel:`List`" +" button) and enable :guilabel:`Is published`. Click the :guilabel:`Is " +"Published` column to re-order it either by **published** or **unpublished** " +"products. Finally, select the products to publish by ticking their box on " +"the extreme-right, and tick any box of the selected products in the " +":guilabel:`Is Published` column to publish them all." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "List and dropdown toggle buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:47 +msgid "Product page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:49 +msgid "" +"Once a product is created, you can access its **product page** through the " +":guilabel:`Shop` page by clicking on the product, and then clicking " +":guilabel:`Edit`. Here, you can change the page's **additional functions**, " +"**layout**, **add content**, etc. Note that **enabled functions** apply to " +"*all* product pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:57 +msgid "Additional functions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:59 +msgid "" +"In the **website builder** window, click :guilabel:`Customize` to enable " +"additional functions:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:61 +msgid "" +":guilabel:`Customers: Rating` allows customers to submit :ref:`product " +"reviews <product-reviews>`; :guilabel:`Share` adds social media and email " +"icon buttons to share the product via those channels;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:64 +msgid "" +":guilabel:`Select Quantity`: if enabled, allows to choose the quantity added" +" to cart;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:65 +msgid "" +":guilabel:`Tax Indication`: notifies if the price is **VAT included** or " +"**excluded**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:66 +msgid "" +":guilabel:`Variants`: shows all possible :doc:`variants " +"</applications/sales/sales/products_prices/products/variants>` of the " +"product as a :guilabel:`Products List`; :guilabel:`Options` as selectable " +"options to compose the variant yourself;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:70 +msgid "" +":guilabel:`Cart`: :guilabel:`Buy Now` adds a :ref:`checkout button " +"<cart/buy-now>` taking the customer directly to the checkout page; " +":guilabel:`Wishlist` allows to add the product to a wishlist;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:73 +msgid "" +":guilabel:`Specification`: allows you to select where the " +":guilabel:`Specifications` section is displayed. This option displays a list" +" of all variant attributes and values of a product, but only works for " +"products *with* variants." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:78 +msgid "" +"To allow **wishlists**, the option must be enabled in " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:80 +msgid "" +"To access the :guilabel:`Variants` options, the :doc:`Product Variants " +"<../../../sales/sales/products_prices/products/variants>` option must first " +"be enabled under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:85 +msgid "Layout" +msgstr "レイアウト" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:87 +msgid "" +"Within the same :guilabel:`Customize` tab as the :ref:`functions <ecommerce-" +"functions>`, the layout configuration can be changed according to your " +"needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:90 +msgid "" +":guilabel:`Images Width`: changes the width of the product images displayed " +"on the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:91 +msgid "" +":guilabel:`Layout`: the :guilabel:`Carousel` layout displays a large, main " +"image with smaller ones underneath; whereas the :guilabel:`Grid` displays " +"four images in a square layout (see pictures below);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:94 +msgid "" +":guilabel:`Image Zoom`: choose which image zooms are available, either " +":guilabel:`Pop-up on Click`, when hovering over the image " +"(:guilabel:`Magnifier on hover`), on :guilabel:`Both`, or :guilabel:`None`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:97 +msgid "" +":guilabel:`Thumbnails`: decide how the thumbnails should be aligned, either " +"**vertically** (:guilabel:`Left`), or **horizontally** (:guilabel:`Right`);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:99 +msgid "" +":guilabel:`Main Image`: click :guilabel:`Replace` to change the product's " +"main image;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:100 +msgid "" +":guilabel:`Extra Images`: click :guilabel:`Add` or :guilabel:`Remove all` to" +" add or remove extra product images. You can also add images and videos via " +"**URL**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:104 +msgid "" +"Images must either be in PNG or JPG format. To trigger the zoom, the image " +"has to be bigger than 1024x1024." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product images layout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:114 +msgid "" +"You can use **building blocks** (:menuselection:`Edit --> Blocks`) to add " +"content to your product page. These blocks can be used to add extra text and" +" picture galleries, features such as :guilabel:`Call to Actions`, " +":guilabel:`Comparisons`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:118 +msgid "" +"Depending on *where* you drop the **building block**, it may be available " +"either on the product page *only*, or on the *whole* website. **Building " +"blocks** dropped at the very top or very bottom of the page are available on" +" the *whole* website, where **building blocks** put underneath the product " +"description are only displayed on the *product* page *(see image below)*." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Building blocks on product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:128 +msgid "Download link" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:130 +msgid "" +"To add a downloadable file (ex.: user's manual, notice of use, etc.) on the " +"product page, drag and drop a :guilabel:`Text` block from " +":menuselection:`Edit --> Blocks` on the page. Once placed, click within the " +":guilabel:`Text` block, and under the :guilabel:`Inline Text` section, " +"select either :menuselection:`Insert Media --> Documents` or " +":guilabel:`Insert or edit link` and enter the URL in the :guilabel:`Your " +"URL` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:137 +msgid "" +"The difference with :ref:`digital files <ecommerce-digital-file>` is that " +"digital files can only be downloaded *after* checkout." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Media and link buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:147 +msgid "Digital files" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:149 +msgid "" +"Should your product be sold with a certificate, manual user, or any other " +"relevant document, it is possible to add a download link for customers at " +"the end of the checkout. To do that, first enable :guilabel:`Digital " +"Content` under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Checkout Process`. Then, on the **product's template**, click on " +":menuselection:`More --> Digital Files` and :guilabel:`Create` a new file." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Digital Files menu" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:159 +msgid "For the configuration:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:161 +msgid ":guilabel:`Name`: the name of your file;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:162 +msgid "" +":guilabel:`Type:` select if it is either a **file** or a **URL**. " +"Accordingly, you either have a :guilabel:`File Content (base64)` field to " +"upload your file, or a :guilabel:`URL` field to enter your URL." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:165 +msgid "" +":guilabel:`Website`: the website on which that file is *available*. If you " +"want it available for *all* websites, leave it empty." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:168 +msgid "" +"The file is then available after checkout in the **purchase order** section " +"found on the customer's portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:172 +msgid "Product configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:175 +msgid "Multiple languages" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:177 +msgid "" +"If multiple languages are available on your website and you wish to have the" +" product's information translated, it is necessary to encode this translated" +" information in the **product's template**. Fields with multiple languages " +"available are identifiable by their abbreviation language (ex. :abbr:`EN " +"(English)`) next to their field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Field translation" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:186 +msgid "The **eCommerce-related** fields to translate are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:188 +msgid ":guilabel:`Product name`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:189 +msgid ":guilabel:`Out-of-Stock Message` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:190 +msgid ":guilabel:`Sales Description` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:193 +msgid "" +"Having untranslated content on a web page may be detrimental to the user " +"experience and :doc:`SEO <../../../websites/website/pages/seo>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:196 +msgid "" +"To check the language(s) of your website, go to :menuselection:`Website --> " +"Configuration --> Settings --> Website Info section`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:200 +msgid ":doc:`../../../websites/website/pages/seo`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:201 +msgid ":ref:`Multi-language support <seo-multilanguage>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:206 +msgid "" +"A product can be set available on either *one* or *all* websites, but it is " +"not possible to select *some* websites and not others. To define a product's" +" availability, go to :menuselection:`Website --> eCommerce --> Products`, " +"select your product, and in the :guilabel:`Sales` tab, click the " +":guilabel:`Website` you wish the product to be available on. Leave the field" +" empty for the products to be available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:213 +msgid "Stock management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:215 +msgid "" +"Under the :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`, you can enable and configure inventory management options." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:219 +msgid "" +"To display the stock level on the product page, the :guilabel:`Product Type`" +" on the **product's form** must be set to :guilabel:`Storable` (only " +"available when the **Inventory** app is installed)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:224 +msgid "Inventory" +msgstr "在庫管理" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:226 +msgid "" +"In the :guilabel:`Inventory Defaults` sub-section, you can select the " +"eCommerce selling strategy of products:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:229 +msgid "" +":guilabel:`Warehouse`: if you have multiple warehouses, you can define the " +"warehouse associated to your website. If you have multiple websites, you can" +" select a different one per website;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:231 +msgid "" +":guilabel:`Out-of-Stock (Continue Selling)`: enabling it allows customers to" +" continue placing orders even when the product is **out-of-stock**. Leave it" +" unchecked to **prevent orders**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:234 +msgid "" +":guilabel:`Show Available Qty`: enabling it displays the available quantity " +"left under a specified threshold on the product page. The available quantity" +" is calculated based on the 'On hand' quantity minus the quantity already " +"reserved for outgoing transfers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:239 +msgid ":ref:`Allow only selected customers to buy <cart/prevent-sale>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:242 +msgid "Selling as kit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:244 +msgid "" +"If you are selling non-prepackaged kits (i.e., the kits are made of " +"individual products), we recommend you read the related documentation to " +"keep track of your stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:248 +msgid "" +":doc:`../../../inventory_and_mrp/manufacturing/management/kit_shipping`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:251 +msgid "Product comparison" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:253 +msgid "" +"You can enable a **product comparison tool** for your eCommerce by going to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`," +" and ticking :guilabel:`Product Comparison Tool`. This tool allows to save " +"products' **specifications** and compare them against each other on a single" +" page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:258 +msgid "" +"On the product page, scroll down to the :guilabel:`Specifications` section " +"and click :guilabel:`Compare`. Repeat the same process for all products you " +"wish to compare. Then, click the :guilabel:`Compare` button of the pop-up " +"window at the bottom of the page to reach the comparison summary." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:264 +msgid "" +"The :guilabel:`Product Comparison Tool` can only be used if :doc:`attributes" +" <variants>` are set on the **product's template**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product comparison window" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:3 -msgid "Manage product variants" +msgid "Product variants" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:5 msgid "" -"Product variants are used to offer variations of the same product to your " -"customers on the product's page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:8 -msgid "" -"Let's say one of your customers selects a T-shirt from your product catalog." +"Product variants are variations, such as different colors, materials, etc., " +"of the same product. These variations can differ in price and availability " +"from the product. Product variants can either be :doc:`created " +"<../../../sales/sales/products_prices/products/variants>` or :doc:`imported " +"<../../../sales/sales/products_prices/products/import>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:10 msgid "" -"Then, they choose the size and color they want. The various size and color " -"combinations are known as product variants." +"To use product variants, enable them under :menuselection:`Website --> " +"Configuration --> Settings`, in the :guilabel:`Shop - Products` section." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:14 -msgid "Create attributes & variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 -msgid "" -"In order to create various attributes and variants for your products, you " -"first need to turn on *Variants* in :menuselection:`Sales --> Configuration " -"--> Settings`." +msgid ":doc:`../managing_products/products`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:19 +msgid "Product configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:21 msgid "" -"Then, select a product from the Products list (:menuselection:`Sales / " -"Website --> Products --> Products`). When the product detail form opens, " -"click on *Edit*, and go to the *Variants* tab." +"Adding attributes and values to a product template allows the enabling of " +"the **product configurator** on the product page. Customers use it to " +"configure and select the product variant of their choice; or in the case of " +"multiple attributes, combine those to create a specific variant." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:22 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Variants configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:29 msgid "" -"Here, you can add as many different attributes as you'd like by clicking on " -"*Add a line*." +"The **display type** of each attribute used in the product configurator can " +"be edited through the **website builder** by clicking :menuselection:`Edit " +"--> Customize` on the product page, and then clicking on one of the " +"attributes. You can then select between four options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:24 -msgid "These attributes appear as three different types:" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:33 +msgid ":guilabel:`Radio`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:26 -msgid "Radio buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:34 +msgid ":guilabel:`Pills`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:27 -msgid "Color buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:35 +msgid ":guilabel:`Select`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:28 -msgid "Drop-down menu" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:36 +msgid ":guilabel:`Color`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:30 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Display type options for attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:44 msgid "" -"Several variants appear as soon as there are two values for one attribute." +"Alternatively, the **display type** can be edited through " +":menuselection:`Website --> eCommerce --> Attributes`, selecting an " +"**attribute**, and then choosing a :guilabel:`Display Type`; or through the " +"**product template** by going to :menuselection:`eCommerce --> Products`, " +"selecting a product, and then clicking :guilabel:`Attributes and Variants`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:32 -msgid "Don't forget to hit *Save* once all variants have been entered." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants values" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:39 -msgid "Edit variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:41 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:50 msgid "" -"After you hit *Save*, you are able to see all the variants from the product " -"template detail form via the *Variants* smart button." +"Specific combinations of values can be excluded from the product " +"configurator. This way, customers are unable to select the excluded " +"combination of values. To do so, go to :menuselection:`Website --> eCommerce" +" --> Products`, select a product, and go to :guilabel:`Attributes and " +"Variants`. Then, click on an **attribute**, select a **value**, and in the " +":guilabel:`Exclude for` section, select a :guilabel:`Product Template` and " +"the :guilabel:`Attribute Values` to exclude." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants smart button" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:58 +msgid "Product specifications" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:48 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:60 msgid "" -"Clicking the *Variants* smart button takes you to the Product Variants page," -" where you can edit the following data for each specific variant:" +"Values used for each attribute are displayed as a **specification list** at " +"the bottom of the product page. To be visible, the **specification list** " +"must first be enabled on the product page by going to :menuselection:`Edit " +"--> Customize` and selecting a placement for the field " +":guilabel:`Specification`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:51 -msgid "Picture(s)" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Specifications list on the product page" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:52 -msgid "Internal Reference (SKU #)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:53 -msgid "Barcode" -msgstr "バーコード" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:54 -msgid "Volume" -msgstr "容積" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:55 -msgid "Weight" -msgstr "重量" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:56 -msgid "Cost" -msgstr "原価" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:59 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:70 msgid "" -"Both the Barcode and the Internal Reference are variant-specific. You need " -"to populate them once the variants are generated." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:63 -msgid "Set specific prices per variant" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:65 -msgid "" -"You can set a specific public price per variant by clicking on *Configure " -"Variants* in the product detail form (top-left corner). That takes you to " -"the *Product Variant Values* page for that product." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants configure variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:72 -msgid "" -"To set a specific public price for a particular variant, simply click on the" -" variant you want to modify, then click on *Edit*." +"The product **specification list** can also be used on products without " +"variants. For that, make sure to have no values combination. Products with " +"single values for their attributes do not generate variants." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:75 +msgid "Filter catalog by attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:77 msgid "" -"The *Value Price Extra* field represents the monetary value that is added to" -" the original product price whenever the corresponding attribute value is " -"selected." +"Customers **can** filter the **catalog** based on product attributes and " +"values, allowing them to :ref:`filter <ecommerce-browsing>` the catalog " +"based only on the attribute(s) of their choice." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:82 -msgid "This is how the *Value Price Extra* looks on your website:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra on the frontend" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:89 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:80 msgid "" -"Pricelist formulas let you set advanced price computation methods for " -"product variants. See :doc:`../maximizing_revenue/pricing`." +"To enable **attributes filtering**, go to :menuselection:`Edit --> " +"Customize` from your **main shop page** and click on one of the " +":guilabel:`Categories` in the left column. Here, enable either " +":guilabel:`Left`, :guilabel:`Top`, or **both**, in the " +":guilabel:`Attributes` field." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:93 -msgid "Disable/archive variants" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Categories buttons" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:95 -msgid "" -"You can disable/archive specific variants so they are no longer available in" -" quotes or on your website (not existing in your stock, deprecated, etc.). " -"Simply select *Archive* in their detail form. You can reactivate them the " -"same way." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:103 -msgid "" -"To retrieve such items, hit *Archived* in the *Filters* category while " -"searching the variants list." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive search" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:110 -msgid ":doc:`../../../sales/sales/products_prices/products/variants`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue.rst:5 -msgid "Maximize my revenue" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "Cross-selling: Accessory and Optional Products" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:5 -msgid "" -"Any sales process is an opportunity to maximize revenues. For example, with " -"an extended warranty or some accessories." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "" -"To do so, you can use **Cross-selling**, a sales technique consisting in " -"selling a customer something in addition to the product or service they were" -" originally shopping for. It is a great way to maximize the value of each " -"one of your customers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "It can be done via two different features:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:14 -msgid "" -":ref:`Accessory products <cross_selling/accessory>` on the checkout page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:15 -msgid "" -":ref:`Optional products <cross_selling/optional>` on a new :guilabel:`Add to" -" Cart` screen." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Accessory Products" -msgstr "アクセサリ商品" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 -msgid "" -"**Accessory Products** are products that are displayed when customers review" -" their cart before paying. As an example, you could suggest a mouse or a " -"keyboard when someone buys a computer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 -msgid "" -"To add *Accessory Products*, go to :menuselection:`Website --> Products --> " -"Products` and, under the :guilabel:`Sales Tab`, add your products to the " -":guilabel:`Accessory Products` field." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an accessory product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:32 -msgid "" -"Now, go to your website and add the product to your cart. On the payment " -"step, you can see your accessory products suggested to the customer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "See of payment view and accessory product suggestion." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "" -"`Odoo Tutorials: Alternative, Accessory, and Optional Products " -"<https://www.odoo.com/slides/slide/alternative-accessory-and-optional-" -"products-637>`_." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 -msgid "Optional Products" -msgstr "オプション商品" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "" -"**Optional products** are products directly related to an item. Each time " -"the product is added to a cart, a pop-up appears, suggesting other products " -"to buy." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 -msgid "" -"To enable optional products, go to :menuselection:`Website --> Configuration" -" --> Settings` and tick :guilabel:`Optional Products`. Then, go to " -":menuselection:`Website --> Products --> Products` and open the item you " -"want to add an optional product to. In the :guilabel:`Sales tab` of that " -"product, add as many optional products as you want." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an optional product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:60 -msgid "" -"From now, when a customer adds this product to their cart, a pop-up appears " -"and suggests also adding the optional product(s)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Pop-up with optional products appears." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:68 -msgid ":doc:`upselling`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 -msgid "Adapt prices to website visitors" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:5 -msgid "" -"This section sheds light on pricing features found in the eCommerce app:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:7 -msgid "force a price by geo-localization," -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:9 -msgid "let the customer choose the currency." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:11 -msgid "" -"As a pre-requisite, check out how to managing product pricing: " -":doc:`/applications/sales/sales/products_prices/prices/pricing`)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:15 -msgid "Geo-IP automatically applies the right price" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:17 -msgid "" -"Assign country groups to your pricelists. That way, visitors who aren't " -"logged in yet will get their own currency when landing on your website." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:20 -msgid "Once logged in, they get the pricelist matching their country." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:23 -msgid "Currency selector" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:25 -msgid "" -"In the case that you sell in several currencies, you can let your customers " -"choose their own. Check the *Selectable* box to add the pricelist to the " -"website drop-down menu, which can be found in *Pricelists* under the " -"*Products* menu, located in the Website application." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:35 -msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:36 -msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:37 -msgid ":doc:`promo_code`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:3 -msgid "How to create & share promotional codes" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:5 -msgid "" -"Want to boost your sales for Xmas? Share promocodes through your marketing " -"campaigns and apply any kind of discounts." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:9 -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:13 -#: ../../content/applications/websites/website/publish/multi_website.rst:18 -msgid "Setup" -msgstr "セットアップ" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:11 -msgid "" -"Go to :menuselection:`Sales --> Settings` and choose *Advanced pricing based" -" on formula* for *Sale Price*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:14 -msgid "" -"Go to :menuselection:`Website Admin --> Catalog --> Pricelists` and create a" -" new pricelist with the discount rule (see :doc:`pricing`). Then enter a " -"code." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:21 -msgid "" -"Make the promocode field available on your *Shopping Cart* page (option in " -"*Customize* menu). Add a product to cart to reach it." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:27 -msgid "" -"Once turned on you see a new section on the right side. On clicking *Apply* " -"prices get automatically updated in the cart." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:33 -msgid "" -"The promocode used by the customer is stored in the system so you can " -"analyze the performance of your marketing campaigns." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:39 -msgid "Show sales per pricelists..." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:43 -msgid ":doc:`pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:3 -msgid "How to enable comments & rating" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:5 -msgid "" -"Publishing and monitoring customer experience will help you gain the trust " -"of new customers and better engage with your community. In 2 clicks, allow " -"your customer to share their feedback!" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:15 -msgid "" -"Activate comments & rating from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:21 -msgid "" -"Visitors must log in to share their comments. Make sure they are able to do " -"so (see Portal documentation)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:25 -msgid "Review the posts in real time" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:27 -msgid "" -"Whenever a post is published, the product manager and all the product " -"followers get notified in their Inbox (*Discuss* menu)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:34 -msgid "" -"By default the user who created the product is automatically set as " -"follower." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:36 -msgid "" -"Click the product name to open the detail form and review the comment (in " -"the product discussion thread)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:43 -msgid "Moderate & unpublish" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:45 -msgid "" -"You can easily moderate by using the chatter, either in the product detail " -"form or on the web page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:48 -msgid "" -"To unpublish the post, open the product web page and click the *Published* " -"button to turn it red (*Unpublished*)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:56 -msgid "..tip::" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:55 -msgid "" -"You can access the web page from the detail form by clicking the *Published*" -" smart button (and vice versa)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:3 -msgid "How to sell pricier alternative products (upselling)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:5 -msgid "" -"In order to maximize your revenue, suggesting pricier alternative products " -"is strongly advised for basic items. That way, your customer will spend more" -" time browsing your catalog." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:12 -msgid "To do so:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:14 -msgid "" -"Select such *Alternative Products* in the *Sales* tab of the product detail " -"form. 3 alternatives are fine! Don't publish too many otherwise your " -"customers will be confused." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:20 -msgid "" -"Turn on *Alternative Products* from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 -msgid "Get paid" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:3 -msgid "Manage orders paid with Payment Providers" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:5 -msgid "" -"The moment a payment is officially authorized by a Payment Provider, Odoo " -"*automatically* confirms the order, which triggers the delivery. And, if you" -" invoice based on ordered quantities, you are requested to invoice the " -"order, as well." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:9 -msgid "" -"Let’s take a closer look at how to manage orders paid with Payment " -"Providers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:12 -msgid "Checking the status of a payment" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:14 -msgid "" -"To check the status of a payment, go to :menuselection:`Website --> Orders " -"--> Orders`. Then, simply click on the order you wish to check on." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:17 -msgid "" -"Once you are on the Sales Order page, you will find the payment is confirmed" -" with an automatic note in the *Chatter*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "payment is confirmed in the chatter of sales order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:24 -msgid "" -"If the user decides to create an invoice, the payment is directly " -"reconciled. This note in the *Chatter* includes a link to the Payment entry," -" which contains various details about the transaction, along with a link to " -"the related Journal Entry." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "page with details surrounding the specific transaction" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:32 -msgid "" -"Specific messages are provided to your customers for every payment status " -"whenever they are redirected to Odoo after the transaction. To edit these " -"messages, go to the *Messages* tab of the payment method." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:38 -msgid "Automatically generate invoices at order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:40 -msgid "" -"When the order is confirmed, you can also choose to have an invoice " -"automatically issued and paid. This fully-automated feature is designed for " -"businesses that invoice orders right away." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "To do automatically generate invoices at order:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:45 -msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings --> Invoicing`." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:46 -msgid "" -"Then, under the **Invoicing Policy** option, select *Invoice what is " -"ordered*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "Then activate *Automatic Invoices* and *Save*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "example of automatic invoice" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:54 -msgid "Capture payment after the delivery" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:56 -msgid "" -"If the provider handling the payment is configured to capture amounts " -"manually, the order is confirmed, but the amount is kept on hold. Once the " -"delivery is processed, you can capture the payment from the related Sales " -"Order." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:61 -msgid ":doc:`../../../finance/payment_providers`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:62 -msgid "" -":ref:`Payment Providers: Place a hold on a card " -"<payment_providers/features/manual_capture>`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:5 -msgid "" -"It has never been so easy for your customers to access their customer " -"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" -" suggested to sign up (name, email, password) when the order is placed, and " -"not before. Indeed, nothing is more annoying than going through a signup " -"process before buying something." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:14 -msgid "Sign up" -msgstr "サインアップ" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:16 -msgid "" -"The invitation to sign up shows up when the customer wants to visualize the " -"order from order confirmation email." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:23 -msgid "Customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:25 -msgid "" -"Once logged in the customer will access the account by clicking *My Account*" -" in the login dropdown menu." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:31 -msgid "" -"THere they find all their history. The main address (billing) can also be " -"modified." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:37 -msgid "" -"If the customer is set as a contact of a company in your address book, they " -"will see all the documents whose the customer belongs to this company." -msgstr "" - -#: ../../content/applications/websites/ecommerce/taxes.rst:5 -msgid "Collect taxes" -msgstr "" - -#: ../../content/applications/websites/livechat.rst:8 +#: ../../content/applications/websites/livechat.rst:6 msgid "Live Chat" msgstr "Webチャット" -#: ../../content/applications/websites/livechat.rst:11 -msgid "`Live Chat: product page <https://www.odoo.com/app/live-chat>`_" -msgstr "" - -#: ../../content/applications/websites/livechat/overview.rst:5 -#: ../../content/applications/websites/website/publish/translate.rst:6 -msgid "Overview" -msgstr "概要" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:3 -msgid "Get Started with Live Chat" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:5 +#: ../../content/applications/websites/livechat.rst:8 msgid "" "Live Chat has the highest satisfaction rating of any communication tool. It " "allows fast responses and it is accessible and convenient, as your customers" @@ -913,11 +2530,23 @@ msgid "" "your customers want to talk to you, so let's make it easy." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:10 +#: ../../content/applications/websites/livechat.rst:13 +msgid "`Live Chat: product page <https://www.odoo.com/app/live-chat>`_" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:14 +msgid ":doc:`livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:15 +msgid ":doc:`livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:18 msgid "Set up" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:12 +#: ../../content/applications/websites/livechat.rst:20 msgid "" "Once *Live Chat* is installed on your database, if your website was created " "with Odoo, the application is automatically added to it. All that is left to" @@ -925,284 +2554,282 @@ msgid "" "Live Chat`." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the settings page and the live chat feature for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:21 +#: ../../content/applications/websites/livechat.rst:28 msgid "" "Select the channel to be linked to your website or create one on the fly." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a live chat channel form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:27 +#: ../../content/applications/websites/livechat.rst:33 msgid "For both scenarios, under:" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:30 +#: ../../content/applications/websites/livechat.rst:36 msgid "" "- **Operators**: add agents to respond to the chat requests. Add as many as " "you like, and keep in mind that operators that do not show any activity in " "Odoo for more than 30min are considered disconnected." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:33 +#: ../../content/applications/websites/livechat.rst:39 msgid "" "- **Options**: set the default text to be shown on the live chat button; an " "automated welcome message to be seen by visitors when a conversation is " "initiated, and the text that prompts the user to initiate a chat." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:36 +#: ../../content/applications/websites/livechat.rst:42 msgid "" "- **Channel Rules**: choose an action for a given URL, and/or per country. " "In the example below, the chat window automatically pops-up 3 seconds after " "users (from any country) land on the contact us page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a channel’s rules form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:43 +#: ../../content/applications/websites/livechat.rst:48 msgid "" "GeoIP, which refers to the process of finding a computer terminal’s " "geographical location by its IP address, must be installed on your server. " "Otherwise, under *Channel Rules*, countries are not taken into account." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:48 +#: ../../content/applications/websites/livechat.rst:53 msgid "External options" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:51 +#: ../../content/applications/websites/livechat.rst:56 msgid "" "If your website was not created with Odoo, you can find the code to be added" " to your own, under the *Widget* tab." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:52 +#: ../../content/applications/websites/livechat.rst:57 msgid "" "Odoo also offers an URL you can send to users so they can have access to a " "single live chat page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the widget tab for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:59 +#: ../../content/applications/websites/livechat.rst:63 msgid "Managing chat requests" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:61 +#: ../../content/applications/websites/livechat.rst:65 msgid "" "Conversations initiated by visitors pop up as a direct message, and are " "shown in *Discuss*. Therefore, inquiries can be answered wherever you are in" " Odoo." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of the discuss application with a message sent through live chat in " "Odoo" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:69 +#: ../../content/applications/websites/livechat.rst:72 msgid "" "Conversations are dispatched based on the current workload of the online " "operators." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:72 +#: ../../content/applications/websites/livechat.rst:75 msgid "Leave or join a channel" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:74 +#: ../../content/applications/websites/livechat.rst:77 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel under *Live Chat*, and *Join Channel* or *Leave Channel*." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of a channel form and the option to join a channel for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:82 -#: ../../content/applications/websites/livechat/overview/responses.rst:48 -msgid ":doc:`ratings`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:83 -#: ../../content/applications/websites/livechat/overview/ratings.rst:45 -msgid ":doc:`responses`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/ratings.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:3 msgid "Ratings" msgstr "評価" -#: ../../content/applications/websites/livechat/overview/ratings.rst:5 +#: ../../content/applications/websites/livechat/ratings.rst:5 msgid "" "Giving users the opportunity to rate their interactions can help you " "improving the experience you offer. That means staying on top of your " "customers' needs, besides keeping track of your operators’ performances." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:10 +#: ../../content/applications/websites/livechat/ratings.rst:10 msgid "Customer Rating" msgstr "顧客レーティング" -#: ../../content/applications/websites/livechat/overview/ratings.rst:12 +#: ../../content/applications/websites/livechat/ratings.rst:12 msgid "" "Once the user chooses to close the chat window, he can rate his interaction." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:14 +#: ../../content/applications/websites/livechat/ratings.rst:14 msgid "" "If the user is *Not satisfied* or *Highly dissatisfied*, a field allowing " "for an explanation is shown." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:15 +#: ../../content/applications/websites/livechat/ratings.rst:15 msgid "A copy of the conversation can also be sent by email." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the chat window from a user’s side for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:22 +#: ../../content/applications/websites/livechat/ratings.rst:22 msgid "The rating is shown on the chat window itself for the operator." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "" "View of a chat window from an operator’s side highlighting a rating for Odoo" " Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:28 +#: ../../content/applications/websites/livechat/ratings.rst:28 msgid "And under :menuselection:`Report --> Customer Ratings`." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the customer ratings page in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:35 +#: ../../content/applications/websites/livechat/ratings.rst:35 msgid "Make the rating public" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:37 +#: ../../content/applications/websites/livechat/ratings.rst:37 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel form, click on *Go to Website* and on *Unpublished*, to publish the " "rating of that channel on your website." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the public ratings in the website for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:45 +msgid ":doc:`responses`" +msgstr "" + +#: ../../content/applications/websites/livechat/responses.rst:3 msgid "Commands and Canned Responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:5 +#: ../../content/applications/websites/livechat/responses.rst:5 msgid "" "Using canned responses can help you save time and have a previous, well-" "thought response, to some of your most common questions and comments." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:9 +#: ../../content/applications/websites/livechat/responses.rst:9 msgid "Use commands" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:11 +#: ../../content/applications/websites/livechat/responses.rst:11 msgid "" "Commands are shortcuts that do specific actions within the chat window:" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:13 +#: ../../content/applications/websites/livechat/responses.rst:13 msgid "**/help**: shows a help message." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:14 +#: ../../content/applications/websites/livechat/responses.rst:14 msgid "**/helpdesk**: creates a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:15 +#: ../../content/applications/websites/livechat/responses.rst:15 msgid "**/helpdesk_search**: searches for a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:16 +#: ../../content/applications/websites/livechat/responses.rst:16 msgid "**/history**: shows the last 15 visited pages." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:17 +#: ../../content/applications/websites/livechat/responses.rst:17 msgid "**/lead**: creates a new lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:18 +#: ../../content/applications/websites/livechat/responses.rst:18 msgid "**/leave**: leaves the channel." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *helpdesk tickets*: make sure the application is installed on your " "database and the option *Live Chat* under :menuselection:`Helpdesk --> " "Configuration --> Helpdesk Teams` is enabled." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *leads*: the *CRM* application must be installed on your database." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:26 +#: ../../content/applications/websites/livechat/responses.rst:26 msgid "" "To access the ticket or lead created from the chat, click on the shortcut " "link." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of the chat window with a helpdesk ticket created in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:33 +#: ../../content/applications/websites/livechat/responses.rst:33 msgid "" "Helpdesk tickets created from the chat automatically add the conversation as" " a description of the ticket. The same goes for the creation of a lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:37 +#: ../../content/applications/websites/livechat/responses.rst:37 msgid "Send canned responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:40 +#: ../../content/applications/websites/livechat/responses.rst:40 msgid "" "Canned responses allow you to have a full piece of text being placed when " "you type a shortcut word. To create them, go to :menuselection:`Live Chat " "--> Configuration --> Canned Responses`." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:41 +#: ../../content/applications/websites/livechat/responses.rst:41 msgid "" "To use them during a conversation, simply type **:** followed by the " "shortcut word you created." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of a chat window and the use of a canned response in Odoo Live Chat" msgstr "" +#: ../../content/applications/websites/livechat/responses.rst:48 +msgid ":doc:`ratings`" +msgstr "" + #: ../../content/applications/websites/website.rst:8 msgid "Website" msgstr "Webサイト" @@ -1213,254 +2840,807 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "" -#: ../../content/applications/websites/website/optimize.rst:5 -msgid "Optimize" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:3 -msgid "How to track your website's traffic in Google Analytics" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:5 -msgid "To follow your website's traffic with Google Analytics:" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:7 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 msgid "" -"`Create a Google Analytics account <https://www.google.com/analytics/>`__ if" -" you don't have any." +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:10 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 msgid "" -"Go through the creation form and accept the conditions to get the tracking " -"ID." +"Essential cookies, which are necessary for the website to function properly;" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:15 -msgid "Copy the tracking ID to insert it in Odoo." -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:20 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 msgid "" -"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " -"turn on Google Analytics and paste the tracking ID. Then save the page." +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:27 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 msgid "" -"To make your first steps in Google Analytics, refer to `Google Documentation" -" <https://support.google.com/analytics/answer/1008015?hl=en/>`_." +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR <https://gdpr.eu>`_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:3 -msgid "Track clicks and visitors using Link Trackers" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 msgid "" -"Link Trackers allow you to track your marketing campaigns (emails, banner " -"ads, blog posts, social media posts, affiliate links, etc.). This way, you " -"are able to identify your best traffic sources and make informed decisions " -"about the distribution of your marketing budget." +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:10 -msgid "Configuration" -msgstr "コンフィグレーション" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:12 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings` and activate " -"*Link Trackers*." +"You can :ref:`customize the appearance of your cookies bar <cookies-" +"bar/customization>` and :ref:`edit the content of the related Cookie Policy " +"page <cookies-bar/policy>`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 msgid "" -"View of Website settings page emphasizing the link trackers field in Odoo " -"Website" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:19 -msgid "Set up traceable URLs" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:21 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 msgid "" -"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " -"page`. Here, you are able to get a specific tracked URL based on the " -"campaign, medium, and source being used." +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone -msgid "View of the link tracker fields for Odoo Website" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:28 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 msgid "" -"**URL**: url of the page you want to track (e.g. the home page or a " -"product's page)." +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:29 -msgid "**Campaign**: context of your link (e.g. a special promotion)." -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:30 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 msgid "" -"**Medium**: channel used to share (deliver) your link (e.g. an email or a " -"Facebook ad)." +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:31 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 msgid "" -"**Source**: platform where the traffic originates (e.g. Google or Twitter)." +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:33 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 msgid "" -"Now, click on *Get tracked link* to generate a URL that you can post or send" -" by the source you have decided on." +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:37 -msgid "Follow-up on tracked links" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:39 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 msgid "" -"To look at statistics of your links, go to :menuselection:`Website --> Go to" -" website --> Promote --> Track this page`. Besides being able to see the " -"*Most Clicked* and *Recently Used* links, you can also see complete " -"statistics by clicking on *Stats*, including the number of clicks, and the " -"country of origin for those clicks." +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 msgid "" -"View of the tracked list emphasizing the statistics buttons in Odoo Website" +"You could add a link providing access to this page, in your website's " +"footer, for example." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:50 -msgid "You can also access the link tracker on *odoo.com/r* via your browser." +#: ../../content/applications/websites/website/configuration/multi_website.rst:3 +msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:51 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Activate the developer mode (:menuselection:`Settings --> Activate the " -"developer mode`) and get access to the *Link Tracker* module and its back-" -"end functionalities." +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:53 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Integrated with :doc:`Google Analytics <google_analytics>`, those trackers " -"allow you to see the number of clicks and visitors to keep you on top of " -"your marketing campaigns." +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:55 +#: ../../content/applications/websites/website/configuration/multi_website.rst:18 msgid "" -"The integration with the :doc:`CRM " -"</applications/sales/crm/track_leads/prospect_visits>` application allows " -"you to understand where your leads and opportunities are coming from." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:3 -msgid "Website analytics with Plausible.io" +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:5 -msgid "To follow your website's traffic with Plausible.io:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:7 +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"`Create a Plausible.io account <https://plausible.io/register>`_ if you " -"don't have any." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 msgid "" -"`Create your website <https://plausible.io/sites/new>`_ and `Start " -"collecting data` if it is not already done." +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:10 +#: ../../content/applications/websites/website/configuration/multi_website.rst:36 +msgid "Click the :guilabel:`Create` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Go through the `list of your websites <https://plausible.io/sites>`_ and " -"click on the gear icon." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Click on cog icon in the list of websites" +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:16 +#: ../../content/applications/websites/website/configuration/multi_website.rst:48 msgid "" -"Click on the button :guilabel:`+ New Link` in the tab Visibility to create " -"your Shared links." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Adding a shared link in the Visibility tab" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:22 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 msgid "" -"Choose a name (and NO password - it is not supported to embed it in Odoo) " -"and click on the button `Create Shared Link`." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Credentials creation for the new shared link" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:29 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"Copy the new Shared Link URL from Plausible.io and paste it into the " -"Settings of Odoo." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Copy the shared link URL from Plausible.io" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Paste the shared link URL to Odoo settings" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "**You are on the Odoo Online Platform**" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 msgid "" -"When you `create your Odoo Online database <https://www.odoo.com/trial>`_, " -"we create it for you on our own server. You don't have anything to do." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "**What about the Goal?**" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 msgid "" -"Odoo pushes out-of-the-box custom events: `Lead Generation` and `Shop`." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:3 -msgid "How to do Search Engine Optimisation (SEO) in Odoo" +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:5 +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 +msgid "" +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:98 +msgid "Records and features can be made available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:100 +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:102 +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:106 +msgid "Website pages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:108 +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:111 +msgid "Select the website on which the page is currently published." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:132 +msgid "" +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "価格設定" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:139 +msgid "" +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "レポーティング" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:155 +msgid "" +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 +msgid "" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 +msgid "Geo IP Installation (On-Premises Database)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:6 +msgid "Installation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:9 +msgid "" +"Please note that the installation depends on your computer's operating " +"system and distribution. We will assume that a Linux operating system is " +"being used." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:15 +msgid "Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:17 +msgid "" +"Download the `GeoLite2 City database " +"<https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with a" +" file called ``GeoLite2-City.mmdb``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:22 +msgid "Move the file to the folder ``/usr/share/GeoIP/``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:24 +msgid "Restart the server" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:27 +msgid "" +"If you can't/don't want to locate the geoip database in " +"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " +"command line interface. This option takes the absolute path to the GeoIP " +"database file and uses it as the GeoIP database. For example:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:36 +msgid ":doc:`CLI documentation </developer/reference/cli>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:39 +msgid "" +"``GeoIP`` Python library can also be used. However this version is " +"discontinued since January 1. See `GeoLite Legacy databases are now " +"discontinued <https://support.maxmind.com/geolite-legacy-discontinuation-" +"notice/>`_" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:44 +msgid "How To Test GeoIP Geolocation In Your Odoo Website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:46 +msgid "Go to your website. Open the web page that you want to test ``GeoIP``." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:47 +msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:48 +msgid "Add the following piece of XML in the page :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:54 +msgid "" +"You should end up with a dictionary indicating the location of the IP " +"address." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:60 +msgid "" +"If the curly braces are empty ``{}``, it can be for any of the following " +"reasons :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:62 +msgid "" +"The browsing IP address is the localhost (``127.0.0.1``) or a local area " +"network one (``192.168.*.*``)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:64 +msgid "" +"If a reversed proxy is used, make sure to configure it correctly. See " +":option:`proxy mode <odoo-bin --proxy-mode>`" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:66 +msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:67 +msgid "The GeoIP database was unable to resolve the given IP address" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:3 +msgid "Translations" +msgstr "翻訳" + +#: ../../content/applications/websites/website/configuration/translate.rst:5 +msgid "" +"The contents of your website pages (i.e., text strings) can be translated " +"into different languages directly on your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:8 +msgid "" +"Your website is displayed in the language that matches the visitor's " +"browser's language, unless that particular language has not been installed. " +"In this case, the website is displayed in the :ref:`default language " +"<translate/default-language>`. The visitor can still select another language" +" in the language menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:14 +msgid "Installing languages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:16 +msgid "" +"To translate your website, you first have to add the required languages:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:18 +msgid "Go to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:19 +msgid "Scroll to the bottom of the page to the **language menu**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:20 +msgid "Click the language and select :guilabel:`Add a language`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:25 +msgid "" +"Click the :guilabel:`Languages` field and select the required language from " +"the drop-down list. Repeat this step for each additional language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:27 +msgid "Click the :guilabel:`Add` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:30 +msgid "" +"You can also edit your website's languages from the backend, in the " +":guilabel:`Settings`. Go to :menuselection:`Website –> Configuration –> " +"Settings` and add/remove the required languages in the :guilabel:`Languages`" +" field, in the :guilabel:`Website info` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:37 +msgid "Default language" +msgstr "デフォルト言語" + +#: ../../content/applications/websites/website/configuration/translate.rst:39 +msgid "" +"If the language of the visitor's browser is not installed on your website, " +"the content is displayed in the default language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:42 +msgid "" +"To define a default language, go to :menuselection:`Website –> Configuration" +" –> Settings`, and select a language in the :guilabel:`Default` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:46 +msgid "" +"This field is visible only if multiple languages are already configured for " +"your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:49 +msgid "Translating the contents" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:51 +msgid "" +"Once the languages have been added, you can translate the contents of your " +"website. To do so, go to your website, select the language from the language" +" menu and click the :guilabel:`Translate` button on the right part of the " +"task bar to activate the **translation mode**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Translate button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:58 +msgid "As a result:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:60 +msgid "" +"Text strings that have already been translated are highlighted in green;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:61 +msgid "Text strings that need to be translated are highlighted in yellow." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Text to be translated highlighted in yellow" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:66 +msgid "" +"You can then replace the original text with the translation by clicking the " +"block, editing its contents and saving." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:70 +msgid "" +"Once the languages have been installed, you can also translate some items " +"(e.g., the product's name and description) from the backend (e.g., in the " +"product template). To do so, click the language code (e.g., :guilabel:`EN`) " +"next to the text you want to translate (e.g., the product name) and add the " +"translation." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Translate product-related items." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:78 +msgid "" +"You can also :doc:`export/import translations " +"<../../../../developer/howtos/translations>` to translate multiple items " +"(e.g., product names and descriptions) in one go." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:82 +msgid "Language selector menu" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:84 +msgid "To add a language selector menu:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:86 +msgid "Go to your website and click :guilabel:`Edit`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:87 +msgid "" +"Select the block where you want to add the language selector menu (e.g., the" +" header)." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:88 +msgid "Select the :guilabel:`Customize` tab." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:89 +msgid "" +"In the :guilabel:`Navbar` section, set the :guilabel:`Language selector` " +"field to either :guilabel:`Dropdown` or :guilabel:`Inline`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language selector menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:95 +msgid "Click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:3 +msgid "Unsplash (free images)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:6 +msgid "Generate an Unsplash access key" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:9 +msgid "" +"**As an Odoo Online user**, you are ready to use Unsplash. You won't need to" +" follow this guide to set up Unsplash information since you will use our own" +" Odoo Unsplash key in a transparent way." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:13 +msgid "Generate an Unsplash access key for non-Odoo Online users" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:15 +msgid "Create an account on `Unsplash.com <https://unsplash.com/join>`_." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:17 +msgid "" +"Go to your `applications dashboard " +"<https://unsplash.com/oauth/applications>`_ and click on **New " +"Application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:23 +msgid "Accept the conditions and click on **Accept terms**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:28 +msgid "" +"You will be prompted to insert an **Application name** and a " +"**Description**. Please prefix your application name by \"**Odoo:** \" so " +"that Unsplash can recognize it as an Odoo instance. Once done, click on " +"**Create application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:35 +msgid "" +"You should be redirected to your application details page. Scroll down a bit" +" to find your **access key**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:42 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a " +"restriction of 50 Unsplash requests per hour." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:46 +msgid "Generate an Unsplash application ID" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:49 +msgid "You should first create and set up your Unsplash application." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:51 +msgid "" +"Go to your `applications dashboard " +"<https://unsplash.com/oauth/applications>`_ and click on your newly created " +"Unsplash application under **Your applications**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:57 +msgid "" +"You will be redirected to your application details page. The **application " +"ID** will be visible in your browser's URL. The URL should be something like" +" ``https://unsplash.com/oauth/applications/<application_id>``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:65 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a 50 " +"Unsplash requests per hour restriction." +msgstr "" + +#: ../../content/applications/websites/website/pages.rst:5 +msgid "Pages" +msgstr "ページ" + +#: ../../content/applications/websites/website/pages/seo.rst:3 +msgid "Search Engine Optimisation (SEO)" +msgstr "" + +#: ../../content/applications/websites/website/pages/seo.rst:5 msgid "" "Search Engine Optimization (SEO) is a set of good practices to optimize your" " website so that you get a better ranking in search engines like Google. In " "short, a good SEO allows you to get more visitors." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:9 +#: ../../content/applications/websites/website/pages/seo.rst:9 msgid "" "Some examples of SEO rules: your web pages should load fast, your page " "should have one and only one title ``<h1>``, meta tags (alt-tag, title-tag) " @@ -1468,28 +3648,28 @@ msgid "" "``/sitemap.xml`` file, etc." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:15 +#: ../../content/applications/websites/website/pages/seo.rst:15 msgid "" "To guarantee Odoo Website and Odoo eCommerce users have a great SEO, Odoo " "abstracts all the technical complexities of SEO and handles everything for " "you, in the best possible way. This will be explained here below." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:20 +#: ../../content/applications/websites/website/pages/seo.rst:20 msgid "" "But first, let see how you can easily boost your ranking by finetuning the " "content and the meta tags of your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:24 +#: ../../content/applications/websites/website/pages/seo.rst:24 msgid "Meta Tags" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:27 +#: ../../content/applications/websites/website/pages/seo.rst:27 msgid "Title, Description" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:29 +#: ../../content/applications/websites/website/pages/seo.rst:29 msgid "" "Every web page should define the ``<title>`` and ``<description>`` meta " "data. These information elements are used by search engines to promote your " @@ -1498,11 +3678,11 @@ msgid "" "otherwise you will be downgraded by search engines." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:39 +#: ../../content/applications/websites/website/pages/seo.rst:39 msgid "Keywords" msgstr "キーワード" -#: ../../content/applications/websites/website/optimize/seo.rst:40 +#: ../../content/applications/websites/website/pages/seo.rst:41 msgid "" "In order to write quality content and boost your traffic, Odoo provides a " "``<keyword>`` finder. Those keywords are the searches you want to head " @@ -1511,28 +3691,28 @@ msgid "" "the related searches in Google. The more keywords are used the better." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:50 +#: ../../content/applications/websites/website/pages/seo.rst:51 msgid "" "If your website is in multiple languages, you can use the Promote tool for " "every language of a single page and set specific title, description and " "search tags." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:55 +#: ../../content/applications/websites/website/pages/seo.rst:56 msgid "Content is King" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:57 +#: ../../content/applications/websites/website/pages/seo.rst:58 msgid "" "When it comes to SEO, content is usually king. Odoo provides several modules" " to help you build your website content:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:60 +#: ../../content/applications/websites/website/pages/seo.rst:61 msgid "**Odoo Blogs**: write great contents." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:62 +#: ../../content/applications/websites/website/pages/seo.rst:63 msgid "" "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their " "content is automatically indexed on the web page. Example: " @@ -1540,147 +3720,147 @@ msgid "" "channel-1>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:66 +#: ../../content/applications/websites/website/pages/seo.rst:67 msgid "" "**Odoo Forum**: let your community create contents for you. Example: " "`odoo.com/forum/1 <https://odoo.com/forum/1>`_ (accounts for 30% of Odoo.com" " landing pages)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:70 +#: ../../content/applications/websites/website/pages/seo.rst:71 msgid "" "**Odoo Mailing List Archive**: publish mailing list archives on your " "website. Example: `odoo.com/groups/community-59 " "<https://www.odoo.com/groups/community-59>`_ (1000 pages created per month)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:76 +#: ../../content/applications/websites/website/pages/seo.rst:77 msgid "" "The 404 page is a regular page, that you can edit like any other page in " "Odoo. That way, you can build a great 404 page to redirect to the top " "content of your website when visitors get lost in invalid URLs." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:81 +#: ../../content/applications/websites/website/pages/seo.rst:82 msgid "Use Social Networks" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:83 +#: ../../content/applications/websites/website/pages/seo.rst:84 msgid "" "Social media is built for mass sharing. If lots of people share your content" " on social media, then it's likely more people will link to it, and links " "are a huge factor for SEO ranking." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:87 +#: ../../content/applications/websites/website/pages/seo.rst:88 msgid "Odoo embeds several tools to share content through social media:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:90 +#: ../../content/applications/websites/website/pages/seo.rst:91 msgid "Social Network" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:92 +#: ../../content/applications/websites/website/pages/seo.rst:93 msgid "" "Odoo allows to link all your social network accounts in your website footer." " All you have to do is to refer all your accounts in your company settings." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:99 +#: ../../content/applications/websites/website/pages/seo.rst:100 msgid "Social Share" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:101 +#: ../../content/applications/websites/website/pages/seo.rst:102 msgid "" "Drop the building block *Share* on any page you want your visitors to share." " By clicking the icon, they are prompted to share the page in their social " "media wall." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:108 +#: ../../content/applications/websites/website/pages/seo.rst:109 msgid "" "Most social media use a picture of the picture to decorate the share post. " "Odoo uses the website logo by default but you can choose any other image of " "your page in the Promote tool." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:116 +#: ../../content/applications/websites/website/pages/seo.rst:117 msgid "Facebook Page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:118 +#: ../../content/applications/websites/website/pages/seo.rst:119 msgid "" "Drop the building block *Facebook Page* to display a widget of your Facebook" " business page and encourage visitors to follow it. You can display the " "timeline, the next events and the messages." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:123 +#: ../../content/applications/websites/website/pages/seo.rst:124 msgid "Twitter Scroller" msgstr "Twitterスクロール" -#: ../../content/applications/websites/website/optimize/seo.rst:125 +#: ../../content/applications/websites/website/pages/seo.rst:126 msgid "" "Display the Twitter feeds with customer satifaction on your website. This " "will increase the number of tweets and shares." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:129 +#: ../../content/applications/websites/website/pages/seo.rst:130 msgid "Test Your Website" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:131 +#: ../../content/applications/websites/website/pages/seo.rst:132 msgid "" "You can compare how your website rank, in terms of SEO, against Odoo using " "WooRank free services: `woorank.com <https://www.woorank.com>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:136 +#: ../../content/applications/websites/website/pages/seo.rst:137 msgid "URLs Handling" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:138 +#: ../../content/applications/websites/website/pages/seo.rst:139 msgid "This section sheds some light on how Odoo makes URLs SEO-friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:141 +#: ../../content/applications/websites/website/pages/seo.rst:142 msgid "URLs Structure" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:143 +#: ../../content/applications/websites/website/pages/seo.rst:144 msgid "A typical Odoo URL will look like this:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:145 +#: ../../content/applications/websites/website/pages/seo.rst:146 msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:147 +#: ../../content/applications/websites/website/pages/seo.rst:148 msgid "With the following components:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:149 +#: ../../content/applications/websites/website/pages/seo.rst:150 msgid "**https://** = Protocol" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:151 +#: ../../content/applications/websites/website/pages/seo.rst:152 msgid "**www.mysite.com** = your domain name" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:153 +#: ../../content/applications/websites/website/pages/seo.rst:154 msgid "" "**/fr\\_FR** = page language. This part of the URL is removed if the visitor" " browses the main language of the website Thus, the main version of this " "page is: https://www.mysite.com/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:158 +#: ../../content/applications/websites/website/pages/seo.rst:159 msgid "" "**/shop/product** = every module defines its own namespace (/shop is for the" " catalog of the eCommerce module, /shop/product is for a product page)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:162 +#: ../../content/applications/websites/website/pages/seo.rst:163 msgid "" "**my-great-product** = by default, this is the slugified title of the " "product this page refers to. But you can customize it for SEO purposes. A " @@ -1689,100 +3869,100 @@ msgid "" "forum post, forum comment, product category, etc.)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:169 +#: ../../content/applications/websites/website/pages/seo.rst:170 msgid "**-31** = the unique ID of the product" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:171 +#: ../../content/applications/websites/website/pages/seo.rst:172 msgid "" "Note that any dynamic component of an URL can be reduced to its ID. As an " "example, the following URLs all do a 301 redirect to the above URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:174 +#: ../../content/applications/websites/website/pages/seo.rst:175 msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:176 +#: ../../content/applications/websites/website/pages/seo.rst:177 msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:178 +#: ../../content/applications/websites/website/pages/seo.rst:179 msgid "" "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product " "name)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:181 +#: ../../content/applications/websites/website/pages/seo.rst:182 msgid "" "Some URLs have several dynamic parts, like this one (a blog category and a " "post):" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:184 +#: ../../content/applications/websites/website/pages/seo.rst:185 msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:186 +#: ../../content/applications/websites/website/pages/seo.rst:187 msgid "In the above example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:188 +#: ../../content/applications/websites/website/pages/seo.rst:189 msgid "*Company News* is the title of the blog" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:190 +#: ../../content/applications/websites/website/pages/seo.rst:191 msgid "*The Odoo Story* is the title of a specific blog post" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:192 +#: ../../content/applications/websites/website/pages/seo.rst:193 msgid "" "When an Odoo page has a pager, the page number is set directly in the URL " "(does not have a GET argument). This allows every page to be indexed by " "search engines. Example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:196 +#: ../../content/applications/websites/website/pages/seo.rst:197 msgid "https://www.odoo.com/blog/page/3" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:199 +#: ../../content/applications/websites/website/pages/seo.rst:200 msgid "Changes in URLs & Titles" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:201 +#: ../../content/applications/websites/website/pages/seo.rst:202 msgid "" "When the URL of a page changes (e.g. a more SEO friendly version of your " "product name), you don't have to worry about updating all links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:204 +#: ../../content/applications/websites/website/pages/seo.rst:205 msgid "Odoo will automatically update all its links to the new URL." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:206 +#: ../../content/applications/websites/website/pages/seo.rst:207 msgid "" "If external websites still points to the old URL, a 301 redirect will be " "done to route visitors to the new address of the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:209 +#: ../../content/applications/websites/website/pages/seo.rst:210 msgid "As an example, this URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:211 +#: ../../content/applications/websites/website/pages/seo.rst:212 msgid "http://mysite.com/shop/product/old-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:213 +#: ../../content/applications/websites/website/pages/seo.rst:214 msgid "Will automatically redirect to:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:215 +#: ../../content/applications/websites/website/pages/seo.rst:216 msgid "http://mysite.com/shop/product/new-and-better-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:217 +#: ../../content/applications/websites/website/pages/seo.rst:218 msgid "" "In short, just change the title of a blog post or the name of a product, and" " the changes will apply automatically everywhere in your website. The old " @@ -1790,11 +3970,11 @@ msgid "" "maintaining the SEO link juice." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:223 +#: ../../content/applications/websites/website/pages/seo.rst:224 msgid "HTTPS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:225 +#: ../../content/applications/websites/website/pages/seo.rst:226 msgid "" "Search engines boost ranking of secure HTTPS/SSL websites. So, by default " "all Odoo Online instances are fully based on HTTPS. If the visitor accesses " @@ -1802,84 +3982,84 @@ msgid "" "equivalent." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:231 +#: ../../content/applications/websites/website/pages/seo.rst:232 msgid "Links: Nofollow Strategy" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:233 +#: ../../content/applications/websites/website/pages/seo.rst:234 msgid "" "The more a page is linked from external and quality websites, the better it " "is for your SEO." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:236 +#: ../../content/applications/websites/website/pages/seo.rst:237 msgid "Here are Odoo strategies to manage links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:238 +#: ../../content/applications/websites/website/pages/seo.rst:239 msgid "" "Every link you add to your website is \"dofollow\", which means that this " "link will contribute to the SEO Juice for the linked page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:242 +#: ../../content/applications/websites/website/pages/seo.rst:243 msgid "" "Every link posted by a contributor (forum post, blog comment, etc.) that " "links to your own website is \"dofollow\" too." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:245 +#: ../../content/applications/websites/website/pages/seo.rst:246 msgid "" "But every link posted by a contributor that links to an external website is " "\"nofollow\". In that way, you do not run the risk of people posting links " "on your website to third-party websites which have a bad reputation." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:250 +#: ../../content/applications/websites/website/pages/seo.rst:251 msgid "" "Note that, when using the forum, contributors having a lot of Karma can be " "trusted. In such case, their links will not have any ``rel=\"nofollow\"`` " "attribute." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:255 +#: ../../content/applications/websites/website/pages/seo.rst:256 msgid "Multi-Language Support" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:258 +#: ../../content/applications/websites/website/pages/seo.rst:261 msgid "Multi-Language URLs" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:260 +#: ../../content/applications/websites/website/pages/seo.rst:263 msgid "" "If you run a website in multiple languages, the same content will be " "available in different URLs, depending on the language used:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:263 +#: ../../content/applications/websites/website/pages/seo.rst:266 msgid "" "https://www.mywebsite.com/shop/product/my-product-1 (main language, English " "here)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:265 +#: ../../content/applications/websites/website/pages/seo.rst:268 msgid "" "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French " "version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:267 +#: ../../content/applications/websites/website/pages/seo.rst:270 msgid "" "In this example, fr\\_FR is the language of the page. You can even have " "several variations of the same language: pt\\_BR (Portuguese from Brazil) , " "pt\\_PT (Portuguese from Portugal)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:272 +#: ../../content/applications/websites/website/pages/seo.rst:275 msgid "Language Annotation" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:274 +#: ../../content/applications/websites/website/pages/seo.rst:277 msgid "" "To let search engines know that the second URL is the French translation of " "the first URL, Odoo will add an HTML link element in the header. In the HTML" @@ -1887,34 +4067,34 @@ msgid "" "pointing to the translated versions of that webpage;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:279 +#: ../../content/applications/websites/website/pages/seo.rst:282 msgid "" "<link rel=\"alternate\" hreflang=\"fr\" " "href=\"https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1\"/>" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:282 +#: ../../content/applications/websites/website/pages/seo.rst:285 msgid "With this approach:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:284 +#: ../../content/applications/websites/website/pages/seo.rst:287 msgid "" "Search engines will redirect to the right language according to the visitor " "language." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:287 +#: ../../content/applications/websites/website/pages/seo.rst:290 msgid "" "You do not get penalized by search engines if your page is not translated " "yet. Indeed, it's not a duplicated content, but a different version of the " "same content." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:292 +#: ../../content/applications/websites/website/pages/seo.rst:295 msgid "Language Detection" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:294 +#: ../../content/applications/websites/website/pages/seo.rst:297 msgid "" "When a visitor lands for the first time on your website (e.g. " "yourwebsite.com/shop), they may automatically be redirected to a translated " @@ -1922,13 +4102,13 @@ msgid "" "yourwebsite.com/fr\\_FR/shop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:299 +#: ../../content/applications/websites/website/pages/seo.rst:302 msgid "" "Next time, it keeps a cookie of the current language to avoid any " "redirection." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:302 +#: ../../content/applications/websites/website/pages/seo.rst:305 msgid "" "To force a visitor to stick to the default language, you can use the code of" " the default language in your link, example: yourwebsite.com/en\\_US/shop. " @@ -1936,15 +4116,15 @@ msgid "" "using the browser language preferences." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:309 +#: ../../content/applications/websites/website/pages/seo.rst:312 msgid "Page Speed" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:312 +#: ../../content/applications/websites/website/pages/seo.rst:315 msgid "Introduction" msgstr "入門" -#: ../../content/applications/websites/website/optimize/seo.rst:314 +#: ../../content/applications/websites/website/pages/seo.rst:317 msgid "" "The time to load a page is an important criteria for search engines. A " "faster website not only improves your visitor's experience, but gives you a " @@ -1956,42 +4136,42 @@ msgid "" "amazon-16-billion-sales>`__." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:325 +#: ../../content/applications/websites/website/pages/seo.rst:328 msgid "" "Fortunately, Odoo does all the magic for you. Below, you will find the " "tricks Odoo uses to speed up your page loading time. You can compare how " "your website ranks using these two tools:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:329 +#: ../../content/applications/websites/website/pages/seo.rst:332 msgid "" "`Google Page Speed " "<https://developers.google.com/speed/pagespeed/insights/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:331 +#: ../../content/applications/websites/website/pages/seo.rst:334 msgid "`Pingdom Website Speed Test <http://tools.pingdom.com/fpt/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:334 +#: ../../content/applications/websites/website/pages/seo.rst:337 msgid "Images" msgstr "画像" -#: ../../content/applications/websites/website/optimize/seo.rst:336 +#: ../../content/applications/websites/website/pages/seo.rst:339 msgid "" "When you upload new images, Odoo automatically compresses them to reduce " "their sizes (lossless compression for .PNG and .GIF and lossy compression " "for .JPG)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:340 +#: ../../content/applications/websites/website/pages/seo.rst:343 msgid "" "From the upload button, you have the option to keep the original image " "unmodified if you prefer to optimize the quality of the image rather than " "performance." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:348 +#: ../../content/applications/websites/website/pages/seo.rst:351 msgid "" "Odoo compresses images when they are uploaded to your website, not when " "requested by the visitor. Thus, it's possible that, if you use a third-party" @@ -1999,18 +4179,18 @@ msgid "" "images used in Odoo official themes have been compressed by default." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:354 +#: ../../content/applications/websites/website/pages/seo.rst:357 msgid "" "When you click on an image, Odoo shows you the Alt and title attributes of " "the ``<img>`` tag. You can click on it to set your own title and Alt " "attributes for the image." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:361 +#: ../../content/applications/websites/website/pages/seo.rst:364 msgid "When you click on this link, the following window will appear:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:366 +#: ../../content/applications/websites/website/pages/seo.rst:369 msgid "" "Odoo's pictograms are implemented using a font (`Font Awesome " "<https://fortawesome.github.io/Font-Awesome/icons/>`__ in most Odoo themes)." @@ -2018,32 +4198,32 @@ msgid "" "not result in extra requests to load the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:375 +#: ../../content/applications/websites/website/pages/seo.rst:378 msgid "Static Resources: CSS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:377 +#: ../../content/applications/websites/website/pages/seo.rst:380 msgid "" "All CSS files are pre-processed, concatenated, minified, compressed and " "cached (server-side and browser-side). The result:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:380 +#: ../../content/applications/websites/website/pages/seo.rst:383 msgid "only one CSS file request is needed to load a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:382 +#: ../../content/applications/websites/website/pages/seo.rst:385 msgid "" "this CSS file is shared and cached amongst pages, so that when the visitor " "clicks on another page, the browser doesn't have to even load a single CSS " "resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:386 +#: ../../content/applications/websites/website/pages/seo.rst:389 msgid "this CSS file is optimized to be small" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:388 +#: ../../content/applications/websites/website/pages/seo.rst:391 msgid "" "**Pre-processed:** The CSS framework used by Odoo is Bootstrap. Although a " "theme might use another framework, most of `Odoo themes " @@ -2053,7 +4233,7 @@ msgid "" "file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:395 +#: ../../content/applications/websites/website/pages/seo.rst:398 msgid "" "**Concatenated:** every module or library you might use in Odoo has its own " "set of CSS, Less or Sass files (eCommerce, blogs, themes, etc.). Having " @@ -2065,7 +4245,7 @@ msgid "" "on the number of requests to be done than the actual file size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:405 +#: ../../content/applications/websites/website/pages/seo.rst:408 msgid "" "To address this issue, all CSS / Less / Sass files are concatenated into a " "single .CSS file to send to the browser. So a visitor has **only one .CSS " @@ -2074,55 +4254,55 @@ msgid "" "browser does not even have to load a new CSS file!" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**Both files in the <head>**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**What the visitor gets (only one file)**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 +#: ../../content/applications/websites/website/pages/seo.rst:417 msgid "/\\* From bootstrap.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:421 -#: ../../content/applications/websites/website/optimize/seo.rst:447 +#: ../../content/applications/websites/website/pages/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:424 +#: ../../content/applications/websites/website/pages/seo.rst:450 msgid ".text-muted {" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:422 -#: ../../content/applications/websites/website/optimize/seo.rst:448 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:425 +#: ../../content/applications/websites/website/pages/seo.rst:451 msgid "color: #666;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "color: #777;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "background: yellow" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:420 msgid "background: yellow;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 -#: ../../content/applications/websites/website/optimize/seo.rst:418 -#: ../../content/applications/websites/website/optimize/seo.rst:423 -#: ../../content/applications/websites/website/optimize/seo.rst:449 +#: ../../content/applications/websites/website/pages/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:421 +#: ../../content/applications/websites/website/pages/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:452 msgid "}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:423 msgid "/\\* From my-theme.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:429 msgid "" "The CSS sent by Odoo includes all CSS / Less / Sass of all pages / modules. " "By doing this, additional page views from the same visitor will not have to " @@ -2134,79 +4314,79 @@ msgid "" " backend (/web)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:436 +#: ../../content/applications/websites/website/pages/seo.rst:439 msgid "" "If the CSS file is very big, Odoo will split it into two smaller files to " "avoid the 4095 selectors limit per sheet of Internet Explorer. But most " "themes fit below this limit." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:440 +#: ../../content/applications/websites/website/pages/seo.rst:443 msgid "" "**Minified:** After being pre-processed and concatenated, the resulting CSS " "is minified to reduce its size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**Before minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**After minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid "/\\* some comments \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid ".text-muted {color: #666}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:452 +#: ../../content/applications/websites/website/pages/seo.rst:455 msgid "" "The final result is then compressed, before being delivered to the browser." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:455 +#: ../../content/applications/websites/website/pages/seo.rst:458 msgid "" "Then, a cached version is stored server-side (so we do not have to pre-" "process, concatenate, minify at every request) and browser-side (so the same" " visitor will load the CSS only once for all pages they visit)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:461 +#: ../../content/applications/websites/website/pages/seo.rst:464 msgid "Static Resources: Javascript" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:463 +#: ../../content/applications/websites/website/pages/seo.rst:466 msgid "" "As with CSS resources, Javascript resources are also concatenated, minified," " compressed and cached (server-side and browser-side)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:466 +#: ../../content/applications/websites/website/pages/seo.rst:469 msgid "Odoo creates three Javascript bundles:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:468 +#: ../../content/applications/websites/website/pages/seo.rst:471 msgid "" "One for all pages of the website (including code for parallax effects, form " "validation, etc.)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:471 +#: ../../content/applications/websites/website/pages/seo.rst:474 msgid "" "One for common Javascript code shared among frontend and backend (Bootstrap)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:474 +#: ../../content/applications/websites/website/pages/seo.rst:477 msgid "" "One for backend specific Javascript code (Odoo Web Client interface for your" " employees using Odoo)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:477 +#: ../../content/applications/websites/website/pages/seo.rst:480 msgid "" "Most visitors of your website will only need the first two bundles, " "resulting in a maximum of two Javascript files to load to render one page. " @@ -2214,7 +4394,7 @@ msgid "" "visitor will not load any other Javascript resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:483 +#: ../../content/applications/websites/website/pages/seo.rst:486 msgid "" "If you work on :ref:`developer mode <developer-mode>`, the CSS and " "Javascript are neither concatenated, nor minified. Thus, it's much slower. " @@ -2222,102 +4402,102 @@ msgid "" "Javascript resources are not transformed from their original versions." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:488 +#: ../../content/applications/websites/website/pages/seo.rst:491 msgid "CDN" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:490 +#: ../../content/applications/websites/website/pages/seo.rst:493 msgid "" "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, " "images) are loaded from a Content Delivery Network. Using a Content Delivery" " Network has three advantages:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:494 +#: ../../content/applications/websites/website/pages/seo.rst:497 msgid "" "Load resources from a nearby server (most CDN have servers in main countries" " around the globe)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:497 +#: ../../content/applications/websites/website/pages/seo.rst:500 msgid "" "Cache resources efficiently (no computation resources usage on your own " "server)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:500 +#: ../../content/applications/websites/website/pages/seo.rst:503 msgid "" "Split the resource loading on different services allowing to load more " "resources in parallel (since the Chrome limit of 6 parallel requests is by " "domain)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:504 +#: ../../content/applications/websites/website/pages/seo.rst:507 msgid "" "You can configure your CDN options from the **Website Admin** app, using the" " Configuration menu. Here is an example of configuration you can use:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:511 +#: ../../content/applications/websites/website/pages/seo.rst:514 msgid "HTML Pages" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:513 +#: ../../content/applications/websites/website/pages/seo.rst:516 msgid "" "The HTML pages can be compressed, but this is usually handled by your web " "server (NGINX or Apache)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:516 +#: ../../content/applications/websites/website/pages/seo.rst:519 msgid "" "The Odoo Website builder has been optimized to guarantee clean and short " "HTML code. Building blocks have been developed to produce clean HTML code, " "usually using Bootstrap and the HTML editor." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:520 +#: ../../content/applications/websites/website/pages/seo.rst:523 msgid "" "As an example, if you use the color picker to change the color of a " "paragraph to the primary color of your website, Odoo will produce the " "following code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:524 +#: ../../content/applications/websites/website/pages/seo.rst:527 msgid "``<p class=\"text-primary\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:526 +#: ../../content/applications/websites/website/pages/seo.rst:529 msgid "" "Whereas most HTML editors (such as CKEditor) will produce the following " "code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:529 +#: ../../content/applications/websites/website/pages/seo.rst:532 msgid "``<p style=\"color: #AB0201\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:532 +#: ../../content/applications/websites/website/pages/seo.rst:535 msgid "Responsive Design" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:534 +#: ../../content/applications/websites/website/pages/seo.rst:537 msgid "" "Websites that are not mobile-friendly are negatively impacted in search " "engine rankings. All Odoo themes rely on Bootstrap to render efficiently " "according to the device: desktop, tablet or mobile." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:541 +#: ../../content/applications/websites/website/pages/seo.rst:544 msgid "" "As all Odoo modules share the same technology, absolutely all pages in your " "website are mobile friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:545 +#: ../../content/applications/websites/website/pages/seo.rst:548 msgid "Browser Caching" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:547 +#: ../../content/applications/websites/website/pages/seo.rst:550 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 " @@ -2327,44 +4507,44 @@ msgid "" "your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:554 +#: ../../content/applications/websites/website/pages/seo.rst:557 msgid "" "This allows Odoo to set a very long cache delay (XXX) on these resources: " "XXX secs, while being updated instantly if you update the resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:559 +#: ../../content/applications/websites/website/pages/seo.rst:562 msgid "Scalability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:561 +#: ../../content/applications/websites/website/pages/seo.rst:564 msgid "" "In addition to being fast, Odoo is also more scalable than traditional CMS " "and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:564 +#: ../../content/applications/websites/website/pages/seo.rst:567 msgid "" "Here is the slide that summarizes the scalability of Odoo Website & " "eCommerce." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:570 +#: ../../content/applications/websites/website/pages/seo.rst:573 msgid "Search Engines Files" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:573 +#: ../../content/applications/websites/website/pages/seo.rst:576 msgid "Sitemap" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:575 +#: ../../content/applications/websites/website/pages/seo.rst:578 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/pages/seo.rst:582 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, " @@ -2373,22 +4553,22 @@ msgid "" "chunks per file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:585 +#: ../../content/applications/websites/website/pages/seo.rst:588 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:587 +#: ../../content/applications/websites/website/pages/seo.rst:590 msgid "``<loc>`` : the URL of a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:589 +#: ../../content/applications/websites/website/pages/seo.rst:592 msgid "" "``<lastmod>`` : 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:594 +#: ../../content/applications/websites/website/pages/seo.rst:597 msgid "" "``<priority>`` : modules may implement their own priority algorithm based on" " their content (example: a forum might assign a priority based on the number" @@ -2396,11 +4576,11 @@ msgid "" "it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:601 +#: ../../content/applications/websites/website/pages/seo.rst:604 msgid "Structured Data Markup" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:603 +#: ../../content/applications/websites/website/pages/seo.rst:606 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 " @@ -2408,13 +4588,13 @@ msgid "" "presented search results." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:608 +#: ../../content/applications/websites/website/pages/seo.rst:611 msgid "" "Google supports a number of rich snippets for content types, including: " "Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:611 +#: ../../content/applications/websites/website/pages/seo.rst:614 msgid "" "Odoo implements micro data as defined in the `schema.org " "<http://schema.org>`__ specification for events, eCommerce products, forum " @@ -2422,29 +4602,29 @@ msgid "" "in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:621 +#: ../../content/applications/websites/website/pages/seo.rst:624 msgid "robots.txt" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:623 +#: ../../content/applications/websites/website/pages/seo.rst:626 msgid "" "When indexing your website, search engines take a first look at the general " "indexing rules of the ``/robots.txt`` file (allowed robots, sitemap path, " "etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/pages/seo.rst:630 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:630 +#: ../../content/applications/websites/website/pages/seo.rst:633 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:634 +#: ../../content/applications/websites/website/pages/seo.rst:637 msgid "" "You can customize the file *robots* in :ref:`developer mode <developer-" "mode>` from *Settings --> Technical --> User Interface --> Views* (exclude " @@ -2453,682 +4633,230 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:3 -msgid "Unsplash (free images)" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:3 +msgid "How to track your website's traffic in Google Analytics" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:6 -msgid "Generate an Unsplash access key" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:5 +msgid "To follow your website's traffic with Google Analytics:" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:9 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:7 msgid "" -"**As an Odoo Online user**, you are ready to use Unsplash. You won't need to" -" follow this guide to set up Unsplash information since you will use our own" -" Odoo Unsplash key in a transparent way." +"`Create a Google Analytics account <https://www.google.com/analytics/>`__ if" +" you don't have any." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:13 -msgid "Generate an Unsplash access key for non-Odoo Online users" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:15 -msgid "Create an account on `Unsplash.com <https://unsplash.com/join>`_." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:17 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on **New " -"Application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:23 -msgid "Accept the conditions and click on **Accept terms**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:28 -msgid "" -"You will be prompted to insert an **Application name** and a " -"**Description**. Please prefix your application name by \"**Odoo:** \" so " -"that Unsplash can recognize it as an Odoo instance. Once done, click on " -"**Create application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:35 -msgid "" -"You should be redirected to your application details page. Scroll down a bit" -" to find your **access key**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:42 -msgid "" -"**As a non-Odoo Online user**, you won't be able to register for a " -"production Unsplash key and will be limited to your test key that has a " -"restriction of 50 Unsplash requests per hour." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:46 -msgid "Generate an Unsplash application ID" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:49 -msgid "You should first create and set up your Unsplash application." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:51 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on your newly created " -"Unsplash application under **Your applications**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:57 -msgid "" -"You will be redirected to your application details page. The **application " -"ID** will be visible in your browser's URL. The URL should be something like" -" ``https://unsplash.com/oauth/applications/<application_id>``" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:65 -msgid "" -"**As a non-Odoo Online user**, you won't be able to register for a " -"production Unsplash key and will be limited to your test key that has a 50 " -"Unsplash requests per hour restriction." -msgstr "" - -#: ../../content/applications/websites/website/publish.rst:5 -msgid "Publish" -msgstr "公開" - -#: ../../content/applications/websites/website/publish/multi_website.rst:3 -msgid "Manage Multi Websites" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:8 -msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:12 -msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:20 -msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:40 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:10 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"Go through the creation form and accept the conditions to get the tracking " +"ID." msgstr "" -#: ../../content/applications/websites/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. See :ref:`domain-" -"name/existing`." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:15 +msgid "Copy the tracking ID to insert it in Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:54 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:20 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." +"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " +"turn on Google Analytics and paste the tracking ID. Then save the page." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:62 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:27 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"To make your first steps in Google Analytics, refer to `Google Documentation" +" <https://support.google.com/analytics/answer/1008015?hl=en/>`_." msgstr "" -#: ../../content/applications/websites/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 prompted to create a new page from there." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:3 +msgid "Link trackers" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:76 -msgid "Add features" -msgstr "機能を追加" - -#: ../../content/applications/websites/website/publish/multi_website.rst:78 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:5 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." +"Link Trackers allow you to track your marketing campaigns (emails, banner " +"ads, blog posts, social media posts, affiliate links, etc.). This way, you " +"are able to identify your best traffic sources and make informed decisions " +"about the distribution of your marketing budget." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:82 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:12 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"Go to :menuselection:`Website --> Configuration --> Settings` and activate " +"*Link Trackers*." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:88 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:96 -msgid "languages," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:98 -msgid "domain names," +"View of Website settings page emphasizing the link trackers field in Odoo " +"Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:100 -msgid "social media links," +#: ../../content/applications/websites/website/reporting/link_tracker.rst:19 +msgid "Set up traceable URLs" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:106 -msgid "etc." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:111 -msgid "Manage domain names" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:113 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:21 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." +"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " +"page`. Here, you are able to get a specific tracked URL based on the " +"campaign, medium, and source being used." msgstr "" -#: ../../content/applications/websites/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 +msgid "View of the link tracker fields for Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:129 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:28 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"**URL**: url of the page you want to track (e.g. the home page or a " +"product's page)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:132 -msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:29 +msgid "**Campaign**: context of your link (e.g. a special promotion)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:134 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:30 msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." +"**Medium**: channel used to share (deliver) your link (e.g. an email or a " +"Facebook ad)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:136 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:31 msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:139 -msgid "Customize the visitor experience" +"**Source**: platform where the traffic originates (e.g. Google or Twitter)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:142 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:33 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:152 -msgid "Publish specific content per website" +"Now, click on *Get tracked link* to generate a URL that you can post or send" +" by the source you have decided on." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:155 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:37 +msgid "Follow-up on tracked links" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:39 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:166 -msgid "Products" -msgstr "商品" - -#: ../../content/applications/websites/website/publish/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:170 -msgid "Blogs" -msgstr "ブログ" - -#: ../../content/applications/websites/website/publish/multi_website.rst:172 -msgid "Slide Channels" +"To look at statistics of your links, go to :menuselection:`Website --> Go to" +" website --> Promote --> Track this page`. Besides being able to see the " +"*Most Clicked* and *Recently Used* links, you can also see complete " +"statistics by clicking on *Stats*, including the number of clicks, and the " +"country of origin for those clicks." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:174 -msgid "Forums" -msgstr "フォーラム" - -#: ../../content/applications/websites/website/publish/multi_website.rst:176 -msgid "Events" -msgstr "イベント" - -#: ../../content/applications/websites/website/publish/multi_website.rst:178 -msgid "Job Positions" -msgstr "職位" - -#: ../../content/applications/websites/website/publish/multi_website.rst:181 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:185 -msgid "Publish a page in all websites" +"View of the tracked list emphasizing the statistics buttons in Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:187 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:50 +msgid "You can also access the link tracker on *odoo.com/r* via your browser." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:191 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:51 msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." +"Activate the developer mode (:menuselection:`Settings --> Activate the " +"developer mode`) and get access to the *Link Tracker* module and its back-" +"end functionalities." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:197 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:53 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." +"Integrated with :doc:`Google Analytics <google_analytics>`, those trackers " +"allow you to see the number of clicks and visitors to keep you on top of " +"your marketing campaigns." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:202 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:55 msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." +"The integration with the :doc:`CRM " +"</applications/sales/crm/track_leads/prospect_visits>` application allows " +"you to understand where your leads and opportunities are coming from." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:209 -msgid "Multi-companies" +#: ../../content/applications/websites/website/reporting/plausible.rst:3 +msgid "Website analytics with Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." +#: ../../content/applications/websites/website/reporting/plausible.rst:5 +msgid "To follow your website's traffic with Plausible.io:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:217 +#: ../../content/applications/websites/website/reporting/plausible.rst:7 msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." +"`Create a Plausible.io account <https://plausible.io/register>`_ if you " +"don't have any." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:220 +#: ../../content/applications/websites/website/reporting/plausible.rst:8 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." +"`Create your website <https://plausible.io/sites/new>`_ and `Start " +"collecting data` if it is not already done." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:226 +#: ../../content/applications/websites/website/reporting/plausible.rst:10 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." +"Go through the `list of your websites <https://plausible.io/sites>`_ and " +"click on the gear icon." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:232 -msgid "Configure your eCommerce website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Click on cog icon in the list of websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:234 +#: ../../content/applications/websites/website/reporting/plausible.rst:16 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." +"Click on the button :guilabel:`+ New Link` in the tab Visibility to create " +"your Shared links." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:239 -msgid "Products only available on one website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Adding a shared link in the Visibility tab" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:241 +#: ../../content/applications/websites/website/reporting/plausible.rst:22 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." +"Choose a name (and NO password - it is not supported to embed it in Odoo) " +"and click on the button `Create Shared Link`." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:249 -msgid "Products available on *some* websites" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Credentials creation for the new shared link" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:251 +#: ../../content/applications/websites/website/reporting/plausible.rst:29 msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." +"Copy the new Shared Link URL from Plausible.io and paste it into the " +"Settings of Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:254 -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." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Copy the shared link URL from Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:261 -msgid "Pricelists" -msgstr "価格表" - -#: ../../content/applications/websites/website/publish/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Paste the shared link URL to Odoo settings" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. See " -":doc:`../../ecommerce/maximizing_revenue/pricing`." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**You are on the Odoo Online Platform**" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:269 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"If you need help. Select a website to make a pricelist only available on " -"this website." +"When you `create your Odoo Online database <https://www.odoo.com/trial>`_, " +"we create it for you on our own server. You don't have anything to do." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:288 -msgid "Customer accounts" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:3 -msgid "Geo IP Installation (On-Premises Database)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:6 -msgid "Installation" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:9 -msgid "" -"Please note that the installation depends on your computer's operating " -"system and distribution. We will assume that a Linux operating system is " -"being used." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:15 -msgid "Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:17 -msgid "" -"Download the `GeoLite2 City database " -"<https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with a" -" file called ``GeoLite2-City.mmdb``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:22 -msgid "Move the file to the folder ``/usr/share/GeoIP/``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:24 -msgid "Restart the server" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:27 -msgid "" -"If you can't/don't want to locate the geoip database in " -"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " -"command line interface. This option takes the absolute path to the GeoIP " -"database file and uses it as the GeoIP database. For example:" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36 -msgid ":doc:`CLI documentation </developer/cli>`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39 -msgid "" -"``GeoIP`` Python library can also be used. However this version is " -"discontinued since January 1. See `GeoLite Legacy databases are now " -"discontinued <https://support.maxmind.com/geolite-legacy-discontinuation-" -"notice/>`_" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:44 -msgid "How To Test GeoIP Geolocation In Your Odoo Website" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:45 -msgid "Go to your website. Open the web page that you want to test ``GeoIP``." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:46 -msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:47 -msgid "Add the following piece of XML in the page :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:53 -msgid "" -"You should end up with a dictionary indicating the location of the IP " -"address." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:59 -msgid "" -"If the curly braces are empty ``{}``, it can be for any of the following " -"reasons :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:61 -msgid "" -"The browsing IP address is the localhost (``127.0.0.1``) or a local area " -"network one (``192.168.*.*``)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:62 -msgid "" -"If a reversed proxy is used, make sure to configure it correctly. See " -":option:`proxy mode <odoo-bin --proxy-mode>`" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:63 -msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:64 -msgid "The GeoIP database was unable to resolve the given IP address" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:3 -msgid "How to translate my website" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:8 -msgid "" -"In addition to creating great modern websites, Odoo gives you the " -"possibility to translate it in different languages." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:12 -msgid "Process" -msgstr "処理" - -#: ../../content/applications/websites/website/publish/translate.rst:14 -msgid "" -"Once your website is created, you have the opportunity to translate it in as" -" many different languages as you want." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:17 -msgid "You can only translate your website manually, follow the next step." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:19 -msgid "" -"Now go to your website. On the bottom right corner of the page, click on " -"**Add a language**." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:25 -msgid "" -"Choose the language in which you want to translate your website and then " -"click on **Load.**" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:31 -msgid "" -"You will see that Now, next to English there is also French, which means " -"that the page for the translation has been created. You can also see that " -"some of the text has been translated automatically." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**What about the Goal?**" msgstr "" -#: ../../content/applications/websites/website/publish/translate.rst:38 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"To translate the content of the website, click on **Translate** (here " -"**Traduire** since we want to translate the website in French)." +"Odoo pushes out-of-the-box custom events: `Lead Generation` and `Shop`." msgstr "" diff --git a/locale/ko/LC_MESSAGES/administration.po b/locale/ko/LC_MESSAGES/administration.po index 2d8c4628a..87a63cd55 100644 --- a/locale/ko/LC_MESSAGES/administration.po +++ b/locale/ko/LC_MESSAGES/administration.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Daye Jeong, 2023\n" "Language-Team: Korean (https://app.transifex.com/odoo/teams/41243/ko/)\n" @@ -1357,7 +1357,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -4315,6 +4315,8 @@ msgstr "" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "업그레이드" @@ -4806,276 +4808,344 @@ msgstr "" msgid "**Major releases are in bold type.**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "해당 없음" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "Odoo saas~16.1" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "2023년 2월" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "2023년 2월" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version <https://upgrade.odoo.com/>`_." @@ -5658,7 +5728,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "" @@ -5976,7 +6046,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "개발" @@ -6103,8 +6173,8 @@ msgid "Tabs" msgstr "탭" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "기록" @@ -6132,8 +6202,8 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "메일" @@ -6180,7 +6250,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "" @@ -6196,8 +6266,8 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "로그" @@ -6248,7 +6318,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "" @@ -6345,9 +6415,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "설정" @@ -8205,95 +8275,84 @@ msgid "" "logs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "사용자" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "상태" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -8301,7 +8360,7 @@ msgid "" "documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -8309,106 +8368,106 @@ msgid "" "revisions of this private repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "<https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " "more, it will automatically be synchronized with your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -8417,22 +8476,22 @@ msgid "" "<https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " "your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "활성화" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/ko/LC_MESSAGES/finance.po b/locale/ko/LC_MESSAGES/finance.po index f002c1a6b..05edb0024 100644 --- a/locale/ko/LC_MESSAGES/finance.po +++ b/locale/ko/LC_MESSAGES/finance.po @@ -5,19 +5,19 @@ # # Translators: # Linkup <link-up@naver.com>, 2023 -# Martin Trigaux, 2023 # JH CHOI <hwangtog@gmail.com>, 2023 # Daye Jeong, 2023 # Sarah Park, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Sarah Park, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Korean (https://app.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -542,10 +542,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -569,7 +569,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3896,6 +3896,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "인코텀즈" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5709,6 +5800,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7235,10 +7327,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7250,101 +7341,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "후속조치 보고서" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "후속조치 보고서" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7356,11 +7479,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7368,15 +7491,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9531,19 +9654,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9553,23 +9668,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9577,7 +9680,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9589,21 +9692,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "상품 코드" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9611,24 +9714,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9636,7 +9739,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9645,39 +9748,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9688,96 +9791,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9787,73 +9867,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10194,7 +10274,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11267,7 +11347,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11442,52 +11522,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11495,46 +11556,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "보고서" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12042,70 +12117,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12136,7 +12211,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "수동" @@ -13502,330 +13576,919 @@ msgstr "비용" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "설정" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -13886,7 +14549,7 @@ msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:43 #: ../../content/applications/finance/fiscal_localizations/france.rst:59 msgid "Use" -msgstr "" +msgstr "사용" #: ../../content/applications/finance/fiscal_localizations.rst:45 msgid "" @@ -15434,10 +16097,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "보고서" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -17062,7 +17721,7 @@ msgstr "" #: ../../content/applications/finance/fiscal_localizations/chile.rst:686 msgid "Claim" -msgstr "" +msgstr "청구" #: ../../content/applications/finance/fiscal_localizations/chile.rst:688 msgid "" @@ -24283,7 +24942,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24583,7 +25242,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29107,7 +29766,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29150,7 +29808,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers.rst:358 msgid "Maximum Amount" -msgstr "" +msgstr "최대 금액" #: ../../content/applications/finance/payment_providers.rst:360 msgid "" @@ -29330,14 +29988,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29345,7 +30003,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29419,26 +30077,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29450,7 +30118,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29460,7 +30128,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29471,36 +30139,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29512,26 +30224,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29541,21 +30253,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -29625,7 +30337,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/amazon_payment_services.rst:3 msgid "Amazon Payment Services" -msgstr "" +msgstr "Amazon 결제 서비스" #: ../../content/applications/finance/payment_providers/amazon_payment_services.rst:5 msgid "" @@ -30010,7 +30722,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:3 msgid "Flutterwave" -msgstr "" +msgstr "Flutterwave" #: ../../content/applications/finance/payment_providers/flutterwave.rst:5 msgid "" @@ -30080,7 +30792,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/mercado_pago.rst:3 msgid "Mercado Pago" -msgstr "" +msgstr "Mercado Pago" #: ../../content/applications/finance/payment_providers/mercado_pago.rst:5 msgid "" @@ -30122,7 +30834,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/mollie.rst:3 msgid "Mollie" -msgstr "" +msgstr "Mollie" #: ../../content/applications/finance/payment_providers/mollie.rst:5 msgid "" @@ -30358,7 +31070,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30372,183 +31084,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" +msgid "PayPal" msgstr "페이팔" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30556,7 +31216,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30564,50 +31224,126 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "자격 증명" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" #: ../../content/applications/finance/payment_providers/razorpay.rst:3 msgid "Razorpay" -msgstr "" +msgstr "Razorpay" #: ../../content/applications/finance/payment_providers/razorpay.rst:5 msgid "" diff --git a/locale/ko/LC_MESSAGES/inventory_and_mrp.po b/locale/ko/LC_MESSAGES/inventory_and_mrp.po index bdc49cdc9..0904e67d6 100644 --- a/locale/ko/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/ko/LC_MESSAGES/inventory_and_mrp.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Sarah Park, 2023\n" "Language-Team: Korean (https://app.transifex.com/odoo/teams/41243/ko/)\n" @@ -3451,7 +3451,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/products/usage.rst:49 msgid "Packagings" -msgstr "" +msgstr "패키지 폭" #: ../../content/applications/inventory_and_mrp/inventory/management/products/usage.rst:51 msgid "" @@ -4725,8 +4725,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4763,7 +4763,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4775,8 +4775,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4784,7 +4784,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4861,16 +4861,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4898,8 +4897,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4940,9 +4939,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/ko/LC_MESSAGES/productivity.po b/locale/ko/LC_MESSAGES/productivity.po index d4d111f5f..a4f00ed4d 100644 --- a/locale/ko/LC_MESSAGES/productivity.po +++ b/locale/ko/LC_MESSAGES/productivity.po @@ -3265,7 +3265,7 @@ msgstr "" #: ../../content/applications/productivity/knowledge/articles_editing.rst:211 #: ../../content/applications/productivity/knowledge/articles_editing.rst:236 msgid "Use" -msgstr "" +msgstr "사용" #: ../../content/applications/productivity/knowledge/articles_editing.rst:116 msgid ":guilabel:`Bulleted list`" diff --git a/locale/ko/LC_MESSAGES/sales.po b/locale/ko/LC_MESSAGES/sales.po index 3fe6cc35b..7bb293d3a 100644 --- a/locale/ko/LC_MESSAGES/sales.po +++ b/locale/ko/LC_MESSAGES/sales.po @@ -5,17 +5,17 @@ # # Translators: # JH CHOI <hwangtog@gmail.com>, 2023 -# Martin Trigaux, 2023 # Sarah Park, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Sarah Park, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Korean (https://app.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1623,8 +1624,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1633,9 +1635,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1662,41 +1664,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1704,14 +1696,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1722,7 +1714,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1733,37 +1725,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1773,13 +1765,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1787,27 +1779,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1821,31 +1813,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2400,93 +2392,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "분석" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3850,21 +3859,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "청구서" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3876,7 +3885,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3884,23 +3893,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3911,27 +3920,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3941,23 +3950,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3971,7 +3980,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4605,8 +4614,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/ko/LC_MESSAGES/websites.po b/locale/ko/LC_MESSAGES/websites.po index a64b3d084..3ae2bae66 100644 --- a/locale/ko/LC_MESSAGES/websites.po +++ b/locale/ko/LC_MESSAGES/websites.po @@ -5,18 +5,18 @@ # # Translators: # JH CHOI <hwangtog@gmail.com>, 2023 -# Martin Trigaux, 2023 -# Daye Jeong, 2023 # Sarah Park, 2023 +# Daye Jeong, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Sarah Park, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Korean (https://app.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -485,7 +485,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -583,7 +583,7 @@ msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:26 msgid "Pickup in store" -msgstr "" +msgstr "매장 픽업" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:28 msgid "" @@ -684,7 +684,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1180,6 +1180,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "분석" @@ -1216,7 +1217,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "품목" @@ -1823,11 +1823,11 @@ msgid "" msgstr "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1838,12 +1838,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1851,15 +1851,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1867,11 +1867,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1883,15 +1883,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1903,7 +1903,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2979,435 +2979,286 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "설정" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "기능 추가하기" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "가격 책정" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "보고" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "블로그" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "게시판" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "행사" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "직무 영역" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "여러 개의 회사를 관리하는 경우" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "가격표" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4784,10 +4635,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "보고" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/nl/LC_MESSAGES/administration.po b/locale/nl/LC_MESSAGES/administration.po index 3e3421167..d97394b7c 100644 --- a/locale/nl/LC_MESSAGES/administration.po +++ b/locale/nl/LC_MESSAGES/administration.po @@ -17,10 +17,10 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-19 15:37+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Martin Trigaux, 2023\n" -"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" +"Language-Team: Dutch (https://app.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,93 +47,181 @@ msgid "Install" msgstr "Installeren" #: ../../content/administration/install/cdn.rst:3 -msgid "Setting up a Content Delivery Network (CDN)" +msgid "Set up a content delivery network (CDN)" msgstr "" #: ../../content/administration/install/cdn.rst:8 -msgid "Deploying with KeyCDN_" +msgid "Deploying with KeyCDN" msgstr "" -#: ../../content/administration/install/cdn.rst:12 +#: ../../content/administration/install/cdn.rst:10 msgid "" -"This document will guide you through the setup of a KeyCDN_ account with " -"your Odoo powered website." +"A :abbr:`CDN (Content Delivery Network)` or *content distribution network*, " +"is a geographically distributed network of servers that provides high speed " +"internet content. The :abbr:`CDN (Content Delivery Network)` provides quick," +" high-quality content delivery for content-heavy websites." msgstr "" -#: ../../content/administration/install/cdn.rst:16 -msgid "Step 1: Create a pull zone in the KeyCDN dashboard" -msgstr "" - -#: ../../content/administration/install/cdn.rst:21 +#: ../../content/administration/install/cdn.rst:14 msgid "" -"When creating the zone, enable the CORS option in the :guilabel:`advanced " -"features` submenu. (more on that later)" +"This document will guide you through the setup of a KeyCDN_ account with an " +"Odoo powered website." msgstr "" -#: ../../content/administration/install/cdn.rst:27 -msgid "" -"Once done, you'll have to wait a bit while KeyCDN_ is crawling your website." +#: ../../content/administration/install/cdn.rst:17 +msgid "Create a pull zone in the KeyCDN dashboard" msgstr "" -#: ../../content/administration/install/cdn.rst:32 +#: ../../content/administration/install/cdn.rst:19 msgid "" -"a new URL has been generated for your Zone, in this case it is " -"``http://pulltest-b49.kxcdn.com``" +"On the KeyCDN dashboard, start by navigating to the :menuselection:`Zones` " +"menu item on the left. On the form, give a value to the :guilabel:`Zone " +"Name`, which will appear as part of the :abbr:`CDN (Content Delivery " +"Network)`'s :abbr:`URL (Uniform Resource Locator)`. Then, set the " +":guilabel:`Zone Status` to :guilabel:`active` to engage the zone. For the " +":guilabel:`Zone Type` set the value to :guilabel:`Pull`, and then, finally, " +"under the :guilabel:`Pull Settings`, enter the :guilabel:`Origin URL`— this " +"address should be the full Odoo database :abbr:`URL (Uniform Resource " +"Locator)`." +msgstr "" + +#: ../../content/administration/install/cdn.rst:28 +msgid "" +"Use ``https://yourdatabase.odoo.com`` and replace the *yourdatabase* " +"subdomain prefix with the actual name of the database. A custom :abbr:`URL " +"(Uniform Resource Locator)` can be used, as well, in place of the Odoo " +"subdomain that was provided to the database." +msgstr "" + +#: ../../content/administration/install/cdn.rst-1 +msgid "KeyCDN's Zone configuration page." msgstr "" #: ../../content/administration/install/cdn.rst:36 -msgid "Step 2: Configure the odoo instance with your zone" +msgid "" +"Under the :guilabel:`General Settings` heading below the zone form, click " +"the :guilabel:`Show all settings` button to expand the zone options. This " +"should be the last option on the page. After expanding the " +":guilabel:`General Settings` ensure that the :guilabel:`CORS` option is " +":guilabel:`enabled`." msgstr "" -#: ../../content/administration/install/cdn.rst:38 +#: ../../content/administration/install/cdn.rst:41 msgid "" -"In the Odoo back end, go to the :guilabel:`Website Settings`: menu, then " -"activate the CDN support and copy/paste your zone URL in the :guilabel:`CDN " -"Base URL` field. This field is only visible and configurable if you have " -"developer mode activated." +"Next, scroll to the bottom of the zone configuration page and " +":guilabel:`Save` the changes. KeyCDN will indicate that the new zone will be" +" deployed. This can take about 10 minutes." msgstr "" -#: ../../content/administration/install/cdn.rst:46 -msgid "" -"Now your website is using the CDN for the resources matching the " -":guilabel:`CDN filters` regular expressions." +#: ../../content/administration/install/cdn.rst-1 +msgid "KeyCDN deploying the new Zone." msgstr "" #: ../../content/administration/install/cdn.rst:49 msgid "" -"You can have a look to the HTML of your website in order to check if the CDN" -" integration is properly working." +"A new :guilabel:`Zone URL` has been generated for your Zone, in this example" +" it is ``pulltest-xxxxx.kxcdn.com``. This value will differ for each " +"database." +msgstr "" + +#: ../../content/administration/install/cdn.rst:52 +msgid "" +"Copy this :guilabel:`Zone URL` to a text editor for later, as it will be " +"used in the next steps." +msgstr "" + +#: ../../content/administration/install/cdn.rst:55 +msgid "Configure the Odoo instance with the new zone" msgstr "" #: ../../content/administration/install/cdn.rst:57 -msgid "Why should I activate CORS?" -msgstr "" - -#: ../../content/administration/install/cdn.rst:59 msgid "" -"A security restriction in some browsers (Firefox and Chrome at time of " -"writing) prevents a remotely linked CSS file to fetch relative resources on " -"this same external server." +"In the Odoo :guilabel:`Website` app, go to the :menuselection:`Settings` and" +" then activate the :guilabel:`Content Delivery Network (CDN)` setting and " +"copy/paste the :guilabel:`Zone URL` value from the earlier step into the " +":guilabel:`CDN Base URL` field. This field is only visible and configurable " +"when :doc:`Developer Mode <../../applications/general/developer_mode>` is " +"activated." msgstr "" #: ../../content/administration/install/cdn.rst:63 msgid "" -"If you don't activate the CORS option in the CDN zone, the more obvious " -"resulting problem on a default Odoo website will be the lack of font-awesome" -" icons because the font file declared in the font-awesome CSS won't be " -"loaded on the remote server." +"Ensure that there are two *forward slashes* (`//`) before the :guilabel:`CDN" +" Base URL` and one forward slash (`/`) after the :guilabel:`CDN Base URL`." msgstr "" -#: ../../content/administration/install/cdn.rst:68 -msgid "Here's what you would see on your homepage in such a case:" +#: ../../content/administration/install/cdn.rst:66 +msgid ":guilabel:`Save` the settings when complete." msgstr "" -#: ../../content/administration/install/cdn.rst:73 -msgid "A security error message will also appear in the browser's console:" +#: ../../content/administration/install/cdn.rst-1 +msgid "Activate the CDN setting in Odoo." msgstr "" -#: ../../content/administration/install/cdn.rst:78 -msgid "Enabling the CORS option in the CDN fixes this issue." +#: ../../content/administration/install/cdn.rst:72 +msgid "" +"Now the website is using the CDN for the resources matching the " +":guilabel:`CDN filters` regular expressions." +msgstr "" + +#: ../../content/administration/install/cdn.rst:75 +msgid "" +"In the HTML of the Odoo website, the :abbr:`CDN (content delivery network)` " +"integration is evidenced as working properly by checking the :abbr:`URL " +"(Uniform Resource Locators)` of images. The *CDN Base URL* value can be seen" +" by using your web browser's :guilabel:`Inspect` feature on the Odoo " +"website. Look for it's record by searching within the :guilabel:`Network` " +"tab inside of devtools." +msgstr "" + +#: ../../content/administration/install/cdn.rst-1 +msgid "" +"The CDN Base URL can be seen using the inspect function on the Odoo website." +msgstr "" + +#: ../../content/administration/install/cdn.rst:85 +msgid "" +"Prevent security issues by activating cross-origin resource sharing (CORS)" +msgstr "" + +#: ../../content/administration/install/cdn.rst:87 +msgid "" +"A security restriction in some browsers (such as Mozilla Firefox and Google " +"Chrome) prevents a remotely linked CSS file to fetch relative resources on " +"this same external server." +msgstr "" + +#: ../../content/administration/install/cdn.rst:90 +msgid "" +"If the :abbr:`CORS (Cross-Origin Resource Sharing)` option isn't enabled in " +"the :guilabel:`CDN Zone`, the more obvious resulting problem on a standard " +"Odoo website will be the lack of *Font Awesome* icons because the font file " +"declared in the *Font Awesome* CSS won't be loaded from the remote server." +msgstr "" + +#: ../../content/administration/install/cdn.rst:95 +msgid "" +"When these cross-origin resource issues occur, a security error message " +"similar to the output below will appear in the web browser's developer " +"console:" +msgstr "" + +#: ../../content/administration/install/cdn.rst:98 +msgid "" +"``Font from origin 'http://pulltest-xxxxx.kxcdn.com' has been blocked from " +"loading /shop:1 by Cross-Origin Resource Sharing policy: No 'Access-Control-" +"Allow-Origin' header is present on the requested resource. Origin " +"'http://yourdatabase.odoo.com' is therefore not allowed access.``" +msgstr "" + +#: ../../content/administration/install/cdn.rst-1 +msgid "Error message populated in the browser console." +msgstr "" + +#: ../../content/administration/install/cdn.rst:106 +msgid "" +"Enabling the :abbr:`CORS (Cross-Origin Resource Sharing)` option in the " +":abbr:`CDN (Content Delivery Network)` settings fixes this issue." msgstr "" #: ../../content/administration/install/deploy.rst:3 @@ -454,7 +542,7 @@ msgid "" msgstr "" #: ../../content/administration/install/deploy.rst:215 -#: ../../content/administration/install/deploy.rst:379 +#: ../../content/administration/install/deploy.rst:378 msgid "LiveChat" msgstr "" @@ -554,11 +642,11 @@ msgstr "" msgid "in ``/etc/nginx/sites-enabled/odoo.conf`` set:" msgstr "" -#: ../../content/administration/install/deploy.rst:353 +#: ../../content/administration/install/deploy.rst:352 msgid "Odoo as a WSGI Application" msgstr "" -#: ../../content/administration/install/deploy.rst:355 +#: ../../content/administration/install/deploy.rst:354 msgid "" "It is also possible to mount Odoo as a standard WSGI_ application. Odoo " "provides the base for a WSGI launcher script as ``odoo-wsgi.example.py``. " @@ -568,32 +656,32 @@ msgid "" "configuration file." msgstr "" -#: ../../content/administration/install/deploy.rst:361 +#: ../../content/administration/install/deploy.rst:360 msgid "" "However the WSGI server will only expose the main HTTP endpoint for the web " "client, website and webservice API. Because Odoo does not control the " "creation of workers anymore it can not setup cron or livechat workers" msgstr "" -#: ../../content/administration/install/deploy.rst:366 +#: ../../content/administration/install/deploy.rst:365 msgid "Cron Workers" msgstr "" -#: ../../content/administration/install/deploy.rst:368 +#: ../../content/administration/install/deploy.rst:367 msgid "To run cron jobs for an Odoo deployment as a WSGI application requires" msgstr "" -#: ../../content/administration/install/deploy.rst:370 +#: ../../content/administration/install/deploy.rst:369 msgid "A classical Odoo (run via ``odoo-bin``)" msgstr "" -#: ../../content/administration/install/deploy.rst:371 +#: ../../content/administration/install/deploy.rst:370 msgid "" "Connected to the database in which cron jobs have to be run (via " ":option:`odoo-bin -d`)" msgstr "" -#: ../../content/administration/install/deploy.rst:373 +#: ../../content/administration/install/deploy.rst:372 msgid "" "Which should not be exposed to the network. To ensure cron runners are not " "network-accessible, it is possible to disable the built-in HTTP server " @@ -601,7 +689,7 @@ msgid "" "False`` in the configuration file" msgstr "" -#: ../../content/administration/install/deploy.rst:381 +#: ../../content/administration/install/deploy.rst:380 msgid "" "The second problematic subsystem for WSGI deployments is the LiveChat: where" " most HTTP connections are relatively short and quickly free up their worker" @@ -609,7 +697,7 @@ msgid "" "each client in order to implement near-real-time notifications." msgstr "" -#: ../../content/administration/install/deploy.rst:386 +#: ../../content/administration/install/deploy.rst:385 msgid "" "This is in conflict with the process-based worker model, as it will tie up " "worker processes and prevent new users from accessing the system. However, " @@ -617,12 +705,12 @@ msgid "" "for notifications." msgstr "" -#: ../../content/administration/install/deploy.rst:391 +#: ../../content/administration/install/deploy.rst:390 msgid "" "The solutions to support livechat/motifications in a WSGI application are:" msgstr "" -#: ../../content/administration/install/deploy.rst:393 +#: ../../content/administration/install/deploy.rst:392 msgid "" "Deploy a threaded version of Odoo (instead of a process-based preforking " "one) and redirect only requests to URLs starting with ``/websocket/`` to " @@ -630,17 +718,17 @@ msgid "" "cron instance." msgstr "" -#: ../../content/administration/install/deploy.rst:397 +#: ../../content/administration/install/deploy.rst:396 msgid "" "Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting with " "``/websocket/`` to :option:`the gevent port <odoo-bin --gevent-port>`." msgstr "" -#: ../../content/administration/install/deploy.rst:404 +#: ../../content/administration/install/deploy.rst:403 msgid "Serving static files and attachments" msgstr "" -#: ../../content/administration/install/deploy.rst:406 +#: ../../content/administration/install/deploy.rst:405 msgid "" "For development convenience, Odoo directly serves all static files and " "attachments in its modules. This may not be ideal when it comes to " @@ -648,11 +736,11 @@ msgid "" "server." msgstr "" -#: ../../content/administration/install/deploy.rst:411 +#: ../../content/administration/install/deploy.rst:410 msgid "Serving static files" msgstr "" -#: ../../content/administration/install/deploy.rst:413 +#: ../../content/administration/install/deploy.rst:412 msgid "" "Odoo static files are located in each module's :file:`static/` folder, so " "static files can be served by intercepting all requests to " @@ -660,41 +748,41 @@ msgid "" "in the various addons paths." msgstr "" -#: ../../content/administration/install/deploy.rst:418 +#: ../../content/administration/install/deploy.rst:417 msgid "" "Say Odoo has been installed via the **debian packages** for Community and " "Enterprise and the :option:`--addons-path <odoo-bin --addons-path>` is " "``'/usr/lib/python3/dist-packages/odoo/addons'``." msgstr "" -#: ../../content/administration/install/deploy.rst:421 -#: ../../content/administration/install/deploy.rst:443 +#: ../../content/administration/install/deploy.rst:420 +#: ../../content/administration/install/deploy.rst:442 msgid "" "Using the above NGINX (https) configuration, the following location block " "should be added to serve static files via NGINX." msgstr "" -#: ../../content/administration/install/deploy.rst:438 +#: ../../content/administration/install/deploy.rst:437 msgid "" "Say Odoo has been installed via the **source**. The two git repositories for" " Community and Enterprise have been cloned in :file:`/opt/odoo/community` " "and :file:`/opt/odoo/enterprise` respectively and the :option:`--addons-path" " <odoo-bin --addons-path>` is " -"``'/opt/odoo/community/odoo/addons,/opt/community/addons,/opt/odoo/enterprise'``." +"``'/opt/odoo/community/odoo/addons,/opt/odoo/community/addons,/opt/odoo/enterprise'``." msgstr "" -#: ../../content/administration/install/deploy.rst:460 +#: ../../content/administration/install/deploy.rst:459 msgid "" "The actual NGINX configuration you need is highly dependent on your own " "installation. The two above snippets only highlight two possible " "configurations and may not be used as-is." msgstr "" -#: ../../content/administration/install/deploy.rst:464 +#: ../../content/administration/install/deploy.rst:463 msgid "Serving attachments" msgstr "" -#: ../../content/administration/install/deploy.rst:466 +#: ../../content/administration/install/deploy.rst:465 msgid "" "Attachments are files stored in the filestore which access is regulated by " "Odoo. They cannot be directly accessed via a static web server as accessing " @@ -702,7 +790,7 @@ msgid "" "are stored and whether the current user can access them or not." msgstr "" -#: ../../content/administration/install/deploy.rst:471 +#: ../../content/administration/install/deploy.rst:470 msgid "" "Nevertheless, once the file has been located and the access rights verified " "by Odoo, it is a good idea to serve the file using the static web server " @@ -716,19 +804,19 @@ msgid "" "X-Accel)." msgstr "" -#: ../../content/administration/install/deploy.rst:481 +#: ../../content/administration/install/deploy.rst:480 msgid "" "The X-Sendfile extension for apache (and compatible web servers) does not " "require any supplementary configuration." msgstr "" -#: ../../content/administration/install/deploy.rst:483 +#: ../../content/administration/install/deploy.rst:482 msgid "" "The X-Accel extension for NGINX **does** require the following additionnal " "configuration:" msgstr "" -#: ../../content/administration/install/deploy.rst:492 +#: ../../content/administration/install/deploy.rst:491 msgid "" "In case you don't know what is the path to your filestore, start Odoo with " "the :option:`--x-sendfile <odoo-bin --x-sendfile>` option and navigate to " @@ -737,18 +825,18 @@ msgid "" "need." msgstr "" -#: ../../content/administration/install/deploy.rst:501 +#: ../../content/administration/install/deploy.rst:500 msgid "Security" msgstr "Beveiliging" -#: ../../content/administration/install/deploy.rst:503 +#: ../../content/administration/install/deploy.rst:502 msgid "" "For starters, keep in mind that securing an information system is a " "continuous process, not a one-shot operation. At any moment, you will only " "be as secure as the weakest link in your environment." msgstr "" -#: ../../content/administration/install/deploy.rst:507 +#: ../../content/administration/install/deploy.rst:506 msgid "" "So please do not take this section as the ultimate list of measures that " "will prevent all security problems. It's only intended as a summary of the " @@ -758,20 +846,20 @@ msgid "" "access control management, etc." msgstr "" -#: ../../content/administration/install/deploy.rst:513 +#: ../../content/administration/install/deploy.rst:512 msgid "" "When deploying an internet-facing server, please be sure to consider the " "following security-related topics:" msgstr "" -#: ../../content/administration/install/deploy.rst:516 +#: ../../content/administration/install/deploy.rst:515 msgid "" "Always set a strong super-admin admin password, and restrict access to the " "database management pages as soon as the system is set up. See " ":ref:`db_manager_security`." msgstr "" -#: ../../content/administration/install/deploy.rst:519 +#: ../../content/administration/install/deploy.rst:518 msgid "" "Choose unique logins and strong passwords for all administrator accounts on " "all databases. Do not use 'admin' as the login. Do not use those logins for " @@ -780,14 +868,14 @@ msgid "" "databases." msgstr "" -#: ../../content/administration/install/deploy.rst:524 +#: ../../content/administration/install/deploy.rst:523 msgid "" "Do **not** install demo data on internet-facing servers. Databases with demo" " data contain default logins and passwords that can be used to get into your" " systems and cause significant trouble, even on staging/dev systems." msgstr "" -#: ../../content/administration/install/deploy.rst:528 +#: ../../content/administration/install/deploy.rst:527 msgid "" "Use appropriate database filters ( :option:`--db-filter <odoo-bin --db-" "filter>`) to restrict the visibility of your databases according to the " @@ -797,7 +885,7 @@ msgid "" "backend." msgstr "" -#: ../../content/administration/install/deploy.rst:535 +#: ../../content/administration/install/deploy.rst:534 msgid "" "Once your ``db_name`` and ``db_filter`` are configured and only match a " "single database per hostname, you should set ``list_db`` configuration " @@ -807,7 +895,7 @@ msgid "" "option)" msgstr "" -#: ../../content/administration/install/deploy.rst:541 +#: ../../content/administration/install/deploy.rst:540 msgid "" "Make sure the PostgreSQL user (:option:`--db_user <odoo-bin --db_user>`) is " "*not* a super-user, and that your databases are owned by a different user. " @@ -816,20 +904,20 @@ msgid "" ":ref:`setup/deploy/odoo`." msgstr "" -#: ../../content/administration/install/deploy.rst:546 +#: ../../content/administration/install/deploy.rst:545 msgid "" "Keep installations updated by regularly installing the latest builds, either" " via GitHub or by downloading the latest version from " "https://www.odoo.com/page/download or http://nightly.odoo.com" msgstr "" -#: ../../content/administration/install/deploy.rst:550 +#: ../../content/administration/install/deploy.rst:549 msgid "" "Configure your server in multi-process mode with proper limits matching your" " typical usage (memory/CPU/timeouts). See also :ref:`builtin_server`." msgstr "" -#: ../../content/administration/install/deploy.rst:553 +#: ../../content/administration/install/deploy.rst:552 msgid "" "Run Odoo behind a web server providing HTTPS termination with a valid SSL " "certificate, in order to prevent eavesdropping on cleartext communications. " @@ -839,7 +927,7 @@ msgid "" ":ref:`https_proxy`." msgstr "" -#: ../../content/administration/install/deploy.rst:560 +#: ../../content/administration/install/deploy.rst:559 msgid "" "If you need to allow remote SSH access to your servers, make sure to set a " "strong password for **all** accounts, not just `root`. It is strongly " @@ -849,28 +937,28 @@ msgid "" "detection system such as `fail2ban` or equivalent." msgstr "" -#: ../../content/administration/install/deploy.rst:566 +#: ../../content/administration/install/deploy.rst:565 msgid "" "Consider installing appropriate rate-limiting on your proxy or firewall, to " "prevent brute-force attacks and denial of service attacks. See also " ":ref:`login_brute_force` for specific measures." msgstr "" -#: ../../content/administration/install/deploy.rst:570 +#: ../../content/administration/install/deploy.rst:569 msgid "" "Many network providers provide automatic mitigation for Distributed Denial " "of Service attacks (DDOS), but this is often an optional service, so you " "should consult with them." msgstr "" -#: ../../content/administration/install/deploy.rst:574 +#: ../../content/administration/install/deploy.rst:573 msgid "" "Whenever possible, host your public-facing demo/test/staging instances on " "different machines than the production ones. And apply the same security " "precautions as for production." msgstr "" -#: ../../content/administration/install/deploy.rst:578 +#: ../../content/administration/install/deploy.rst:577 msgid "" "If your public-facing Odoo server has access to sensitive internal network " "resources or services (e.g. via a private VLAN), implement appropriate " @@ -885,7 +973,7 @@ msgid "" "control." msgstr "" -#: ../../content/administration/install/deploy.rst:589 +#: ../../content/administration/install/deploy.rst:588 msgid "" "If your public-facing Odoo server is behind a Web Application Firewall, a " "load-balancer, a transparent DDoS protection service (like CloudFlare) or a " @@ -900,19 +988,19 @@ msgid "" "this purpose." msgstr "" -#: ../../content/administration/install/deploy.rst:600 +#: ../../content/administration/install/deploy.rst:599 msgid "" "If you are hosting multiple customers, isolate customer data and files from " "each other using containers or appropriate \"jail\" techniques." msgstr "" -#: ../../content/administration/install/deploy.rst:603 +#: ../../content/administration/install/deploy.rst:602 msgid "" "Setup daily backups of your databases and filestore data, and copy them to a" " remote archiving server that is not accessible from the server itself." msgstr "" -#: ../../content/administration/install/deploy.rst:610 +#: ../../content/administration/install/deploy.rst:609 msgid "Blocking Brute Force Attacks" msgstr "" @@ -1107,62 +1195,62 @@ msgid "" " script for every new incoming email." msgstr "" -#: ../../content/administration/install/email_gateway.rst:9 +#: ../../content/administration/install/email_gateway.rst:10 msgid "" "The script takes care of connecting to your Odoo database through XML-RPC, " "and send the emails via the `MailThread.message_process()` feature." msgstr "" -#: ../../content/administration/install/email_gateway.rst:13 +#: ../../content/administration/install/email_gateway.rst:14 msgid "Prerequisites" msgstr "Vereisten" -#: ../../content/administration/install/email_gateway.rst:14 +#: ../../content/administration/install/email_gateway.rst:16 msgid "Administrator access to the Odoo database." msgstr "" -#: ../../content/administration/install/email_gateway.rst:15 +#: ../../content/administration/install/email_gateway.rst:17 msgid "Your own mail server such as Postfix or Exim." msgstr "" -#: ../../content/administration/install/email_gateway.rst:16 +#: ../../content/administration/install/email_gateway.rst:18 msgid "Technical knowledge on how to configure an email server." msgstr "" -#: ../../content/administration/install/email_gateway.rst:19 +#: ../../content/administration/install/email_gateway.rst:21 msgid "For Postfix" msgstr "" -#: ../../content/administration/install/email_gateway.rst:20 +#: ../../content/administration/install/email_gateway.rst:23 msgid "In you alias config (:file:`/etc/aliases`):" msgstr "" -#: ../../content/administration/install/email_gateway.rst:27 -#: ../../content/administration/install/email_gateway.rst:41 +#: ../../content/administration/install/email_gateway.rst:30 +#: ../../content/administration/install/email_gateway.rst:45 msgid "Resources" msgstr "Resources" -#: ../../content/administration/install/email_gateway.rst:29 +#: ../../content/administration/install/email_gateway.rst:32 msgid "`Postfix <http://www.postfix.org/documentation.html>`_" msgstr "" -#: ../../content/administration/install/email_gateway.rst:30 +#: ../../content/administration/install/email_gateway.rst:33 msgid "`Postfix aliases <http://www.postfix.org/aliases.5.html>`_" msgstr "" -#: ../../content/administration/install/email_gateway.rst:31 +#: ../../content/administration/install/email_gateway.rst:34 msgid "`Postfix virtual <http://www.postfix.org/virtual.8.html>`_" msgstr "" -#: ../../content/administration/install/email_gateway.rst:35 +#: ../../content/administration/install/email_gateway.rst:38 msgid "For Exim" msgstr "" -#: ../../content/administration/install/email_gateway.rst:43 +#: ../../content/administration/install/email_gateway.rst:47 msgid "`Exim <https://www.exim.org/docs.html>`_" msgstr "" -#: ../../content/administration/install/email_gateway.rst:46 +#: ../../content/administration/install/email_gateway.rst:50 msgid "" "If you don't have access/manage your email server, use :ref:`inbound " "messages <email_communication/inbound_messages>`." @@ -1260,9 +1348,9 @@ msgid "Demo_ instances require no local installation, just a web browser." msgstr "" #: ../../content/administration/install/install.rst:59 -#: ../../content/administration/maintain/domain_names.rst:136 -#: ../../content/administration/maintain/domain_names.rst:206 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/domain_names.rst:166 +#: ../../content/administration/maintain/domain_names.rst:236 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "" @@ -1316,7 +1404,7 @@ msgstr "" #: ../../content/administration/install/install.rst:366 #: ../../content/administration/install/install.rst:431 #: ../../content/administration/install/install.rst:504 -#: ../../content/administration/install/install.rst:671 +#: ../../content/administration/install/install.rst:673 msgid "Windows" msgstr "" @@ -1357,7 +1445,7 @@ msgstr "" #: ../../content/administration/install/install.rst:388 #: ../../content/administration/install/install.rst:451 #: ../../content/administration/install/install.rst:539 -#: ../../content/administration/install/install.rst:682 +#: ../../content/administration/install/install.rst:684 msgid "Linux" msgstr "" @@ -1577,8 +1665,9 @@ msgid "" "that you have basic knowledge of Git commands. To clone a Git repository, " "you must choose between cloning with HTTPS or SSH. If you do not know the " "difference between the two, the best option is most likely HTTPS. If you are" -" following the :doc:`Getting started </developer/howtos/rdtraining>` " -"developer tutorial, or plan on contributing to Odoo source code, choose SSH." +" following the :doc:`Getting started </developer/tutorials/getting_started>`" +" developer tutorial, or plan on contributing to Odoo source code, choose " +"SSH." msgstr "" #: ../../content/administration/install/install.rst:286 @@ -1609,7 +1698,7 @@ msgstr "" #: ../../content/administration/install/install.rst:407 #: ../../content/administration/install/install.rst:474 #: ../../content/administration/install/install.rst:603 -#: ../../content/administration/install/install.rst:692 +#: ../../content/administration/install/install.rst:694 msgid "Mac OS" msgstr "" @@ -1910,62 +1999,62 @@ msgid "" "(homebrew_, macports_)." msgstr "" -#: ../../content/administration/install/install.rst:649 +#: ../../content/administration/install/install.rst:651 msgid "Running Odoo" msgstr "" -#: ../../content/administration/install/install.rst:651 +#: ../../content/administration/install/install.rst:653 msgid "" "Once all dependencies are set up, Odoo can be launched by running `odoo-" "bin`, the command-line interface of the server. It is located at the root of" " the Odoo Community directory." msgstr "" -#: ../../content/administration/install/install.rst:654 +#: ../../content/administration/install/install.rst:656 msgid "" "To configure the server, you can either specify :ref:`command-line arguments" " <reference/cmdline/server>` or a :ref:`configuration file " "<reference/cmdline/config>`." msgstr "" -#: ../../content/administration/install/install.rst:658 +#: ../../content/administration/install/install.rst:660 msgid "" "For the Enterprise edition, you must add the path to the `enterprise` addons" " to the `addons-path` argument. Note that it must come before the other " "paths in `addons-path` for addons to be loaded correctly." msgstr "" -#: ../../content/administration/install/install.rst:662 +#: ../../content/administration/install/install.rst:664 msgid "Common necessary configurations are:" msgstr "" -#: ../../content/administration/install/install.rst:664 +#: ../../content/administration/install/install.rst:666 msgid "PostgreSQL user and password." msgstr "" -#: ../../content/administration/install/install.rst:665 +#: ../../content/administration/install/install.rst:667 msgid "Custom addon paths beyond the defaults, to load your own modules." msgstr "" -#: ../../content/administration/install/install.rst:667 +#: ../../content/administration/install/install.rst:669 msgid "A typical way to run the server would be:" msgstr "" -#: ../../content/administration/install/install.rst:678 +#: ../../content/administration/install/install.rst:680 msgid "" "Where `CommunityPath` is the path of the Odoo Community installation, " "`dbuser` is the PostgreSQL login, `dbpassword` is the PostgreSQL password, " "and `mydb` is the name of the PostgreSQL database." msgstr "" -#: ../../content/administration/install/install.rst:689 -#: ../../content/administration/install/install.rst:699 +#: ../../content/administration/install/install.rst:691 +#: ../../content/administration/install/install.rst:701 msgid "" "Where `CommunityPath` is the path of the Odoo Community installation, and " "`mydb` is the name of the PostgreSQL database." msgstr "" -#: ../../content/administration/install/install.rst:702 +#: ../../content/administration/install/install.rst:704 msgid "" "After the server has started (the INFO log `odoo.modules.loading: Modules " "loaded.` is printed), open http://localhost:8069 in your web browser and log" @@ -1974,29 +2063,30 @@ msgid "" "it, you just logged into your own Odoo database!" msgstr "" -#: ../../content/administration/install/install.rst:708 +#: ../../content/administration/install/install.rst:710 msgid "" "From there, you can create and manage new :doc:`users " "</applications/general/users/manage_users>`." msgstr "" -#: ../../content/administration/install/install.rst:710 +#: ../../content/administration/install/install.rst:712 msgid "" "The user account you use to log into Odoo's web interface differs from the " ":option:`--db_user <odoo-bin -r>` CLI argument." msgstr "" -#: ../../content/administration/install/install.rst:714 +#: ../../content/administration/install/install.rst:716 msgid "" -":doc:`The exhaustive list of CLI arguments for odoo-bin </developer/cli>`." -msgstr "" - -#: ../../content/administration/install/install.rst:719 -#: ../../content/administration/maintain/update.rst:147 -msgid "Docker" +":doc:`The exhaustive list of CLI arguments for odoo-bin " +"</developer/reference/cli>`." msgstr "" #: ../../content/administration/install/install.rst:721 +#: ../../content/administration/maintain/update.rst:149 +msgid "Docker" +msgstr "" + +#: ../../content/administration/install/install.rst:723 msgid "" "The full documentation on how to use Odoo with Docker can be found on the " "official Odoo `docker image <https://hub.docker.com/_/odoo/>`_ page." @@ -2027,14 +2117,22 @@ msgid "" msgstr "" #: ../../content/administration/maintain/azure_oauth.rst:15 +msgid ":doc:`/applications/general/auth/azure`" +msgstr "" + +#: ../../content/administration/maintain/azure_oauth.rst:16 +msgid ":doc:`/applications/productivity/calendar/outlook`" +msgstr "" + +#: ../../content/administration/maintain/azure_oauth.rst:19 msgid "Setup in Microsoft Azure Portal" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:18 +#: ../../content/administration/maintain/azure_oauth.rst:22 msgid "Create a new application" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:20 +#: ../../content/administration/maintain/azure_oauth.rst:24 msgid "" "To get started, go to `Microsoft's Azure Portal " "<https://portal.azure.com/>`_. Log in with the :guilabel:`Microsoft Outlook " @@ -2045,7 +2143,7 @@ msgid "" "Directory`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:26 +#: ../../content/administration/maintain/azure_oauth.rst:30 msgid "" "Now, click on :guilabel:`Add (+)`, located in the top menu, and then select " ":guilabel:`App registration`. On the :guilabel:`Register an application` " @@ -2055,7 +2153,7 @@ msgid "" "- Multitenant) and personal Microsoft accounts (e.g. Skype, Xbox)`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:32 +#: ../../content/administration/maintain/azure_oauth.rst:36 msgid "" "Under the :guilabel:`Redirect URL` section, select :guilabel:`Web` as the " "platform, and then input `https://<odoo base url>/microsoft_outlook/confirm`" @@ -2063,26 +2161,26 @@ msgid "" "which your Odoo instance can be reached in the URL field." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:37 +#: ../../content/administration/maintain/azure_oauth.rst:41 msgid "" "*mydatabase.odoo.com*, where *mydatabase* is the actual prefix of the " "database's subdomain, assuming it's hosted on Odoo.com" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:40 +#: ../../content/administration/maintain/azure_oauth.rst:44 msgid "" "After the URL has been added to the field, :guilabel:`Register` the " "application so it is created." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:43 +#: ../../content/administration/maintain/azure_oauth.rst:47 msgid "API permissions" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:45 +#: ../../content/administration/maintain/azure_oauth.rst:49 msgid "" "The :guilabel:`API permissions` should be set next. Odoo will need specific " -"API permissions to be able to read (IMAP) and send (IMAP) emails in the " +"API permissions to be able to read (IMAP) and send (SMTP) emails in the " "Microsoft 365 setup. First, click the :guilabel:`API permissions` link, " "located in the left menu bar. Next, click on the :guilabel:`(+) Add a " "Permission` button and select :guilabel:`Microsoft Graph` under " @@ -2090,41 +2188,41 @@ msgid "" ":guilabel:`Delegated Permissions` option." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:51 +#: ../../content/administration/maintain/azure_oauth.rst:55 msgid "" "In the search bar, search for the following :guilabel:`Deregulated " "permissions` and click :guilabel:`Add permissions` for each one:" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:54 +#: ../../content/administration/maintain/azure_oauth.rst:58 msgid ":guilabel:`SMTP.Send`" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:55 +#: ../../content/administration/maintain/azure_oauth.rst:59 msgid ":guilabel:`IMAP.AccessAsUser.All`" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:58 +#: ../../content/administration/maintain/azure_oauth.rst:62 msgid "The :guilabel:`User.Read` permission will be added by default." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "" "API permissions needed for Odoo integration are listed under the Microsoft " "Graph." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:65 +#: ../../content/administration/maintain/azure_oauth.rst:69 msgid "Assign users and groups" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:67 +#: ../../content/administration/maintain/azure_oauth.rst:71 msgid "" "After adding the API permissions, navigate back to the :guilabel:`Overview` " "of the :guilabel:`Application` in the top of the left sidebar menu." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:70 +#: ../../content/administration/maintain/azure_oauth.rst:74 msgid "" "Now, add users to this application. Under the :guilabel:`Essentials` " "overview table, click on the link labeled :guilabel:`Managed Application in " @@ -2132,13 +2230,13 @@ msgid "" "table." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "" "Add users/groups by clicking the Managed application in local directory link for the\n" "created application." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:79 +#: ../../content/administration/maintain/azure_oauth.rst:83 msgid "" "In the left sidebar menu, select :guilabel:`Users and Groups`. Next, click " "on :guilabel:`(+) Add User/Group`. Depending on the account, either a " @@ -2147,7 +2245,7 @@ msgid "" "to be added." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:84 +#: ../../content/administration/maintain/azure_oauth.rst:88 msgid "" "Under :guilabel:`Users` or :guilabel:`Groups`, click on :guilabel:`None " "Selected` and add the users or group of users that will be sending emails " @@ -2156,11 +2254,11 @@ msgid "" "the application." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:90 +#: ../../content/administration/maintain/azure_oauth.rst:94 msgid "Create credentials" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:92 +#: ../../content/administration/maintain/azure_oauth.rst:96 msgid "" "Now that the Microsoft Azure app is set up, credentials need to be created " "for the Odoo setup. These include the :guilabel:`Client ID` and " @@ -2170,11 +2268,11 @@ msgid "" " the :guilabel:`Essentials` overview of the app." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "Application/Client ID located in the Overview of the app." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:102 +#: ../../content/administration/maintain/azure_oauth.rst:106 msgid "" "Next, the :guilabel:`Client Secret Value` needs to be retrieved. To get this" " value, click on :guilabel:`Certificates & Secrets` in the left sidebar " @@ -2182,14 +2280,14 @@ msgid "" " this, click on the :guilabel:`(+) New Client Secret` button." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:106 +#: ../../content/administration/maintain/azure_oauth.rst:110 msgid "" "A window on the right will populate with a button labeled :guilabel:`Add a " "client secret`. Under :guilabel:`Description`, type in `Odoo Fetchmail` or " "something recognizable, and then set the :guilabel:`expiration date`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:111 +#: ../../content/administration/maintain/azure_oauth.rst:115 msgid "" "A new :guilabel:`Client Secret` will need to be produced and configured if " "the first one expires. In this event, there could be an interruption of " @@ -2197,7 +2295,7 @@ msgid "" "possible date." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:115 +#: ../../content/administration/maintain/azure_oauth.rst:119 msgid "" "Next, click on :guilabel:`Add` when these two values are entered. A " ":guilabel:`Client Secret Value` and :guilabel:`Secret ID` will be created. " @@ -2206,38 +2304,38 @@ msgid "" "The :guilabel:`Secret ID` is not needed." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "Client Secret Value or Value in the app's credentials." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:124 +#: ../../content/administration/maintain/azure_oauth.rst:128 msgid "" "After these steps, the following items should be ready to be set up in Odoo:" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:126 +#: ../../content/administration/maintain/azure_oauth.rst:130 msgid "A client ID (:guilabel:`Client ID` or :guilabel:`Application ID`)" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:127 +#: ../../content/administration/maintain/azure_oauth.rst:131 msgid "A client secret (:guilabel:`Value` or :guilabel:`Client Secret Value`)" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:129 +#: ../../content/administration/maintain/azure_oauth.rst:133 msgid "" "This completes the setup on the :guilabel:`Microsoft Azure Portal` side." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:132 -#: ../../content/administration/maintain/google_oauth.rst:84 +#: ../../content/administration/maintain/azure_oauth.rst:136 +#: ../../content/administration/maintain/google_oauth.rst:111 msgid "Setup in Odoo" msgstr "Opzetten in Odoo" -#: ../../content/administration/maintain/azure_oauth.rst:135 +#: ../../content/administration/maintain/azure_oauth.rst:139 msgid "Enter Microsoft Outlook credentials" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:137 +#: ../../content/administration/maintain/azure_oauth.rst:141 msgid "" "First, open the Odoo database and navigate to the :guilabel:`Apps` module. " "Then, remove the :guilabel:`Apps` filter from the search bar and type in " @@ -2245,7 +2343,7 @@ msgid "" "Outlook`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:141 +#: ../../content/administration/maintain/azure_oauth.rst:145 msgid "" "Next, navigate to :menuselection:`Settings --> General Settings`, and under " "the :guilabel:`Discuss` section, ensure that the checkbox for " @@ -2253,62 +2351,62 @@ msgid "" " :guilabel:`Outlook Credentials`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:145 +#: ../../content/administration/maintain/azure_oauth.rst:149 msgid ":guilabel:`Save` the progress." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:147 +#: ../../content/administration/maintain/azure_oauth.rst:151 msgid "" "Then, copy and paste the :guilabel:`Client ID` (Application ID) and " ":guilabel:`Client Secret (Client Secret Value)` into the respective fields " "and :guilabel:`Save` the settings." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "Outlook Credentials in Odoo General Settings." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:155 -#: ../../content/administration/maintain/google_oauth.rst:98 +#: ../../content/administration/maintain/azure_oauth.rst:159 +#: ../../content/administration/maintain/google_oauth.rst:127 msgid "Configure outgoing email server" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:157 +#: ../../content/administration/maintain/azure_oauth.rst:161 msgid "" "On the :guilabel:`General Settings` page, under the :guilabel:`Custom Email " "Servers` setting, click the :guilabel:`Outgoing Email Servers` link to " "configure the Microsoft account." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:160 +#: ../../content/administration/maintain/azure_oauth.rst:164 msgid "" "Then, create a new email server and check the box for :guilabel:`Outlook`. " "Next, fill in the :guilabel:`Name` (it can be anything) and the Microsoft " "Outlook email :guilabel:`Username`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:163 +#: ../../content/administration/maintain/azure_oauth.rst:167 msgid "" "If the :guilabel:`From Filter` field is empty, enter either a :ref:`domain " -"or email address <email_communication/default_from>`." +"or email address <email_communication/default>`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:166 -msgid "Then, cick on :guilabel:`Connect your Outlook account`." +#: ../../content/administration/maintain/azure_oauth.rst:170 +msgid "Then, click on :guilabel:`Connect your Outlook account`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:168 +#: ../../content/administration/maintain/azure_oauth.rst:172 msgid "" "A new window from Microsoft opens to complete the :guilabel:`authorization " "process`. Select the appropriate email address that is being configured in " "Odoo." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "Permission page to grant access between newly created app and Odoo." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:175 +#: ../../content/administration/maintain/azure_oauth.rst:179 msgid "" "Then, allow Odoo to access the Microsoft account by clicking on " ":guilabel:`Yes`. After this, the page will navigate back to the newly " @@ -2317,22 +2415,22 @@ msgid "" ":guilabel:`Outlook Token Valid` appears in green." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rstNone +#: ../../content/administration/maintain/azure_oauth.rst-1 msgid "Valid Outlook Token indicator." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:184 +#: ../../content/administration/maintain/azure_oauth.rst:188 msgid "" "Finally, click :guilabel:`Test Connection`. A confirmation message should " "appear. The Odoo database can now send safe, secure emails through Microsoft" " Outlook using OAuth authentication." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:188 +#: ../../content/administration/maintain/azure_oauth.rst:192 msgid "Multiple user configuration" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:190 +#: ../../content/administration/maintain/azure_oauth.rst:194 msgid "" "Each user should have a separate server set up. The :guilabel:`from-filter` " "should be set so that only the user's email is sent from that server. In " @@ -2340,7 +2438,7 @@ msgid "" ":guilabel:`from-filter` is able to use this server." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:194 +#: ../../content/administration/maintain/azure_oauth.rst:198 msgid "" "After setting the :guilabel:`from-filter`, set up a fallback email account " "to allow for the sending of :guilabel:`notifications`. The fallback email " @@ -2351,7 +2449,7 @@ msgid "" "<email_communication/default>`." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:201 +#: ../../content/administration/maintain/azure_oauth.rst:205 #: ../../content/administration/maintain/mailjet_api.rst:213 msgid "" "The :guilabel:`System Parameters` can be accessed by activating " @@ -2360,11 +2458,11 @@ msgid "" " menu." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:206 +#: ../../content/administration/maintain/azure_oauth.rst:210 msgid "Configure incoming email server" msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:208 +#: ../../content/administration/maintain/azure_oauth.rst:212 msgid "" "The incoming account should be configured in a similar way to the outgoing " "email account. Navigate to the :guilabel:`Incoming Mail Servers` in the " @@ -2376,7 +2474,7 @@ msgid "" "account. The account should be ready to receive email to the Odoo database." msgstr "" -#: ../../content/administration/maintain/azure_oauth.rst:216 +#: ../../content/administration/maintain/azure_oauth.rst:220 msgid ":doc:`../../applications/general/email_communication/email_servers`" msgstr "" @@ -2467,43 +2565,97 @@ msgid "" msgstr "" #: ../../content/administration/maintain/domain_names.rst:51 -msgid "Register a free domain name with Odoo" +msgid "Indexing of domain names by search engines" msgstr "" #: ../../content/administration/maintain/domain_names.rst:53 msgid "" +"Search engines, such as Google and Bing, rely on web crawlers (:dfn:`robots " +"that explore and analyze the web`) to index all websites and their related " +"domain names. These crawlers discover new URLs thanks to links on known web " +"pages. As a result, search engines should index domain names automatically " +"after a while, as long as their URLs are mentioned elsewhere on the " +"Internet." +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:58 +msgid "" +"Improving the appearance and positioning of web pages on search engines is a" +" practice named \"Search Engine Optimization\" (SEO)." +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:62 +msgid "" +"Adding relevant content, optimizing metadata, and building high-quality " +"backlinks can all help improve a website's search engine visibility." +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:65 +msgid "" +"Some search engines provide tools for web admins, such as `Google Search " +"Console <https://search.google.com/search-console>`_ and `Bing Webmaster " +"Tools <https://www.bing.com/webmasters>`_, to help you analyze and improve " +"your page ranking. To use these services, you must prove that you are the " +"owner of your domain name. One way to verify the ownership of your domain " +"name is by adding a DNS record. You can do this for :ref:`domain names " +"registered with Odoo <domain-name/odoo-manage>` and for domain names managed" +" by other providers." +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:74 +msgid ":doc:`/applications/websites/website/pages/seo`" +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:75 +msgid "" +"`Google Search Console Help - Verify your site ownership " +"<https://support.google.com/webmasters/answer/9008080>`_" +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:76 +msgid "" +"`Bing Webmaster Tools - Add and Verify site " +"<https://www.bing.com/webmasters/help/add-and-verify-site-12184f8b>`_" +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:81 +msgid "Register a free domain name with Odoo" +msgstr "" + +#: ../../content/administration/maintain/domain_names.rst:83 +msgid "" "You can register a domain name for your Odoo Online database directly from " "Odoo Website or your database manager." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:57 +#: ../../content/administration/maintain/domain_names.rst:87 msgid "" "Your domain name is **free for one year** if you register it with Odoo!" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:58 +#: ../../content/administration/maintain/domain_names.rst:88 msgid "" "The domain name is registered with `Gandi <https://www.gandi.net/>`_, the " "domain name registrar." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:60 +#: ../../content/administration/maintain/domain_names.rst:90 msgid "" "You are the owner of the domain name and can use it for other purposes." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:61 +#: ../../content/administration/maintain/domain_names.rst:91 msgid "Odoo manages payment and technical support for you." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:62 +#: ../../content/administration/maintain/domain_names.rst:92 msgid "" "This offer doesn't include any mailbox. However, you can :ref:`configure " "your MX records <domain-name/odoo-manage>` to use your own email server or " "solution such as Google Workspace." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:65 +#: ../../content/administration/maintain/domain_names.rst:95 msgid "" "To do so, go to :menuselection:`Website --> Domain Name`. Alternatively, " "open your `database manager <https://www.odoo.com/my/databases>`_, click on " @@ -2511,35 +2663,35 @@ msgid "" ":guilabel:`Domain names`." msgstr "" -#: ../../content/administration/maintain/domain_names.rstNone +#: ../../content/administration/maintain/domain_names.rst-1 msgid "Clicking on Domain Names from an Odoo website" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:73 +#: ../../content/administration/maintain/domain_names.rst:103 msgid "" "Search for the domain name of your choice to check its availability, then " "select the one you want to register for your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rstNone +#: ../../content/administration/maintain/domain_names.rst-1 msgid "" "The search of the domain name example.com shows which associated domains are" " available." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:80 +#: ../../content/administration/maintain/domain_names.rst:110 msgid "" "Next, fill in the form with your information to become the domain name " "owner." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:82 +#: ../../content/administration/maintain/domain_names.rst:112 msgid "" "Your domain name is directly linked to your database, but you still have to " ":ref:`map your domain name with your website <domain-name/website-map>`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:86 +#: ../../content/administration/maintain/domain_names.rst:116 msgid "" "Free domain names are also available for free Odoo Online databases (if you " "installed one app only, for example). In this case, Odoo reviews your " @@ -2547,15 +2699,15 @@ msgid "" "days." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:89 +#: ../../content/administration/maintain/domain_names.rst:119 msgid "This is not available for Odoo.sh databases yet." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:94 +#: ../../content/administration/maintain/domain_names.rst:124 msgid "Manage your domain name registered with Odoo" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:96 +#: ../../content/administration/maintain/domain_names.rst:126 msgid "" "To manage the DNS records of your domain name registered with Odoo or to " "visualize the contacts associated with it, open your `database manager " @@ -2564,86 +2716,86 @@ msgid "" ":guilabel:`Contacts` or :guilabel:`DNS`." msgstr "" -#: ../../content/administration/maintain/domain_names.rstNone +#: ../../content/administration/maintain/domain_names.rst-1 msgid "Management of the domain names linked to an Odoo database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:106 +#: ../../content/administration/maintain/domain_names.rst:136 msgid "" "Please `submit a support ticket <https://www.odoo.com/help>`_ if you need " "further assistance to manage your domain name." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:112 +#: ../../content/administration/maintain/domain_names.rst:142 msgid "Configure your existing domain name" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:114 +#: ../../content/administration/maintain/domain_names.rst:144 msgid "" "If you already own a domain name, you can use it to point to your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:116 +#: ../../content/administration/maintain/domain_names.rst:146 msgid "" "To avoid any issue with the :ref:`SSL certificate validation <domain-" "name/ssl>`, we highly recommend that you proceed with the following actions " "in this order:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:119 +#: ../../content/administration/maintain/domain_names.rst:149 msgid "" ":ref:`Add a CNAME record <domain-name/cname>` on your domain name's DNS " "zone." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:120 +#: ../../content/administration/maintain/domain_names.rst:150 msgid "" ":ref:`Map your domain name with your Odoo database <domain-name/db-map>`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:121 +#: ../../content/administration/maintain/domain_names.rst:151 msgid "" ":ref:`Map your domain name with your Odoo website <domain-name/website-" "map>`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:126 +#: ../../content/administration/maintain/domain_names.rst:156 msgid "Add a CNAME record" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:128 +#: ../../content/administration/maintain/domain_names.rst:158 msgid "" "A **CNAME record** is a type of DNS record that points to the domain of " "another website rather than directly to an IP address." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:131 +#: ../../content/administration/maintain/domain_names.rst:161 msgid "" "You need a CNAME record that points to your Odoo database. The requirements " "are detailed in your database manager." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:138 +#: ../../content/administration/maintain/domain_names.rst:168 msgid "" "The target address is the current address of your database, as defined at " "its creation (e.g., ``example.odoo.com``)" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:141 -#: ../../content/administration/maintain/domain_names.rst:220 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/domain_names.rst:171 +#: ../../content/administration/maintain/domain_names.rst:250 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:143 +#: ../../content/administration/maintain/domain_names.rst:173 msgid "" "Your project's main address is defined in :menuselection:`Settings --> " "Project Name`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:145 +#: ../../content/administration/maintain/domain_names.rst:175 msgid "" "If you want to target a specific branch (production, staging or " "development), go to :menuselection:`Branches --> select your branch --> " @@ -2651,29 +2803,29 @@ msgid "" "domain?`. A message indicates which address your CNAME record should target." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:150 -#: ../../content/administration/maintain/domain_names.rst:192 +#: ../../content/administration/maintain/domain_names.rst:180 +#: ../../content/administration/maintain/domain_names.rst:222 msgid "Open your domain name's manager dashboard." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:151 +#: ../../content/administration/maintain/domain_names.rst:181 msgid "" "Open the **DNS zone** management page for the domain name you want to " "configure." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:152 +#: ../../content/administration/maintain/domain_names.rst:182 msgid "Create a **CNAME record** pointing to the address of your database." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:154 +#: ../../content/administration/maintain/domain_names.rst:184 msgid "" "While Odoo suggests creating a CNAME record for your ``www.`` subdomain " "(``www.example.com``), you can of course use any domain name of your choice," " with any subdomain (e.g., ``anything.example.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:159 +#: ../../content/administration/maintain/domain_names.rst:189 msgid "" "You own the domain name ``example.com``, and you have an Odoo Online " "database at the address ``example.odoo.com``. You want to access your Odoo " @@ -2681,7 +2833,7 @@ msgid "" ":ref:`naked domain <domain-name/naked-domain>` ``example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:164 +#: ../../content/administration/maintain/domain_names.rst:194 msgid "" "To do so, you create a CNAME record for the ``www`` subdomain, with " "``example.odoo.com`` as the target. The DNS zone manager generates the " @@ -2689,82 +2841,82 @@ msgid "" "example.odoo.com.``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:168 +#: ../../content/administration/maintain/domain_names.rst:198 msgid "" "You also create a redirection from ``example.com`` to ``wwww.example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:170 +#: ../../content/administration/maintain/domain_names.rst:200 msgid "Your new DNS records are propagated to all DNS servers." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:173 +#: ../../content/administration/maintain/domain_names.rst:203 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" "Hier zijn een paar specifieke richtlijnen om een CNAME record aan te maken:" -#: ../../content/administration/maintain/domain_names.rst:175 +#: ../../content/administration/maintain/domain_names.rst:205 msgid "`GoDaddy <https://www.godaddy.com/help/add-a-cname-record-19236>`_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:176 +#: ../../content/administration/maintain/domain_names.rst:206 msgid "" "`Namecheap " "<https://www.namecheap.com/support/knowledgebase/article.aspx/9646/2237/how-" "to-create-a-cname-record-for-your-domain>`_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:177 +#: ../../content/administration/maintain/domain_names.rst:207 msgid "" "`OVH " "<https://docs.ovh.com/us/en/domains/web_hosting_how_to_edit_my_dns_zone/#add-" "a-new-dns-record>`_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:178 +#: ../../content/administration/maintain/domain_names.rst:208 msgid "" "`CloudFlare <https://support.cloudflare.com/hc/en-" "us/articles/360019093151>`_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:179 +#: ../../content/administration/maintain/domain_names.rst:209 msgid "" "`Google Domains <https://support.google.com/domains/answer/3290350?hl=en>`_" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:184 +#: ../../content/administration/maintain/domain_names.rst:214 msgid "Naked domain" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:186 +#: ../../content/administration/maintain/domain_names.rst:216 msgid "" "A **naked domain** is a domain name that doesn't have any subdomain at the " "beginning of the address (e.g., ``odoo.com`` instead of ``www.odoo.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:189 +#: ../../content/administration/maintain/domain_names.rst:219 msgid "" "You may want your naked domain to redirect to your website as some visitors " "may not type the full domain name to access your website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:193 +#: ../../content/administration/maintain/domain_names.rst:223 msgid "" "Create a **redirection** from the naked domain (``example.com``) to your " "main domain name (``www.example.com``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:197 +#: ../../content/administration/maintain/domain_names.rst:227 msgid "" "Depending on your domain name registrar, this redirection may be already " "pre-configured." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:202 +#: ../../content/administration/maintain/domain_names.rst:232 msgid "Map your domain name with your Odoo database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:208 +#: ../../content/administration/maintain/domain_names.rst:238 msgid "" "Open your `database manager <https://www.odoo.com/my/databases>`_, click on " "the :guilabel:`settings` button next to your database, on :guilabel:`Domain " @@ -2772,7 +2924,7 @@ msgid "" " column." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:212 +#: ../../content/administration/maintain/domain_names.rst:242 msgid "" "Type the domain name you want to add to this database, then click on " ":guilabel:`Verify` to check if the CNAME record is correctly configured. " @@ -2785,7 +2937,7 @@ msgid "" "database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:222 +#: ../../content/administration/maintain/domain_names.rst:252 msgid "" "Go to :menuselection:`Branches --> select your branch --> Settings --> " "Custom domains`, type the domain name you want to add to this database, then" @@ -2796,19 +2948,19 @@ msgstr "" msgid "Mapping a domain name with an Odoo.sh branch" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:230 +#: ../../content/administration/maintain/domain_names.rst:260 msgid "" ":ref:`Odoo.sh branches: settings tab <odoosh-gettingstarted-branches-tabs-" "settings>`" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:233 +#: ../../content/administration/maintain/domain_names.rst:263 msgid "" "Make sure to :ref:`add a CNAME record <domain-name/cname>` to your domain " "name's DNS **before** mapping your domain name with your Odoo database." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:236 +#: ../../content/administration/maintain/domain_names.rst:266 msgid "" "Failing to do so may impede the validation of the :ref:`SSL certificate " "<domain-name/ssl>` and would result in a *certificate name mismatch* error. " @@ -2816,7 +2968,7 @@ msgid "" "connection is not private\"*." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:240 +#: ../../content/administration/maintain/domain_names.rst:270 msgid "" "If this is the case and you have added the domain name to your database's " "settings less than five days ago, wait 24 hours as the validation may still " @@ -2824,11 +2976,11 @@ msgid "" "<https://www.odoo.com/help>`_ including screenshots of your CNAME records." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:247 +#: ../../content/administration/maintain/domain_names.rst:277 msgid "SSL encryption (HTTPS protocol)" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:249 +#: ../../content/administration/maintain/domain_names.rst:279 msgid "" "**SSL encryption** is an encryption-based Internet security protocol. It " "allows your visitors to navigate your website through a secure connection, " @@ -2836,7 +2988,7 @@ msgid "" "address, rather than a non-secure ``http://`` protocol." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:253 +#: ../../content/administration/maintain/domain_names.rst:283 msgid "" "Odoo generates a separate SSL certificate for each domain :ref:`mapped in " "the database manager <domain-name/db-map>`, using integration with `Let's " @@ -2844,147 +2996,147 @@ msgid "" "<https://letsencrypt.org/how-it-works/>`_." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:258 +#: ../../content/administration/maintain/domain_names.rst:288 msgid "The certificate generation may take up to 24h." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:259 +#: ../../content/administration/maintain/domain_names.rst:289 msgid "" "Several attempts to validate your certificate are made during the five days " "following the moment you add your domain name in your database's settings." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:261 +#: ../../content/administration/maintain/domain_names.rst:291 msgid "" "If you already use another service, you can keep using it or simply change " "for Odoo." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:266 +#: ../../content/administration/maintain/domain_names.rst:296 msgid "Web base URL of a database" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:269 +#: ../../content/administration/maintain/domain_names.rst:299 msgid "" "If you have Odoo Website, you can disregard this part and directly :ref:`map" " your domain name with your website <domain-name/website-map>`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:272 +#: ../../content/administration/maintain/domain_names.rst:302 msgid "" "The **web base URL** of a database, or **root URL** affects your main " "website address and all the links sent to your customers (e.g., quotations, " "portal links, etc.)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:275 +#: ../../content/administration/maintain/domain_names.rst:305 msgid "" "To configure it, access your Odoo database with your custom address, then " "log in as an administrator of your database (any user in the *Settings* " "group) from the login screen." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:279 +#: ../../content/administration/maintain/domain_names.rst:309 msgid "" "Connecting to your database with the original Odoo subdomain address (e.g., " "``example.odoo.com`` also updates the web base URL of your database. See " "below to prevent these automatic updates." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:282 +#: ../../content/administration/maintain/domain_names.rst:312 msgid "" "Alternatively, you can do it manually. To do so, activate the " ":ref:`developer mode <developer-mode>`, then go to :menuselection:`Settings " "--> Technical --> System Parameters`." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:285 +#: ../../content/administration/maintain/domain_names.rst:315 msgid "" "Find the key called ``web.base.url`` (or create it if it does not exist) and" " enter the full address of your website as value, such as " "``https://www.example.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:289 +#: ../../content/administration/maintain/domain_names.rst:319 msgid "" "The URL must include the protocol ``https://`` (or ``http://``) and must not" " end with a slash (``/``)." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:292 +#: ../../content/administration/maintain/domain_names.rst:322 msgid "" "To prevent the automatic update of the web base URL when an administrator " "logs in the database, you can create the following System Parameter:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:295 +#: ../../content/administration/maintain/domain_names.rst:325 msgid "key: ``web.base.url.freeze``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:296 +#: ../../content/administration/maintain/domain_names.rst:326 msgid "value: ``True``" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:301 +#: ../../content/administration/maintain/domain_names.rst:331 msgid "Map your domain name with your website" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:303 +#: ../../content/administration/maintain/domain_names.rst:333 msgid "" "Mapping your domain name to your website isn't the same as mapping it with " "your database:" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:305 +#: ../../content/administration/maintain/domain_names.rst:335 msgid "" "It defines your domain name as the main one for your website, helping search" " engines to index your website properly." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:307 +#: ../../content/administration/maintain/domain_names.rst:337 msgid "" "It defines your domain name as the base URL for your database, including the" " portal links sent by email to your customers." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:309 +#: ../../content/administration/maintain/domain_names.rst:339 msgid "" "If you have multiple websites, it maps your domain name with the appropriate" " website." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:311 +#: ../../content/administration/maintain/domain_names.rst:341 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings --> Website " "Info`. If you have multiple websites, select the one you want to configure." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:314 +#: ../../content/administration/maintain/domain_names.rst:344 msgid "" "In the :guilabel:`Domain` field, fill in the web address of your website " "(e.g., ``https://www.example.com``) and click on :guilabel:`Save`." msgstr "" -#: ../../content/administration/maintain/domain_names.rstNone +#: ../../content/administration/maintain/domain_names.rst-1 msgid "Configuring https://www.example.com as the Domain of the website" msgstr "" -#: ../../content/administration/maintain/domain_names.rst:322 +#: ../../content/administration/maintain/domain_names.rst:352 msgid "" "Mapping your domain name with your Odoo website prevents Google from " "indexing both your custom domain name ``www.example.com`` and your original " "odoo database address ``example.odoo.com``." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:325 +#: ../../content/administration/maintain/domain_names.rst:355 msgid "" "If both addresses are already indexed, it may take some time before Google " "removes the indexation of the second address. You may also try using the " -"`Google Search Console <https://search.google.com/search-console/welcome>`_ " -"to fix this." +"`Google Search Console <https://search.google.com/search-console>`_ to fix " +"this." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:330 +#: ../../content/administration/maintain/domain_names.rst:360 msgid "" "If you have multiple websites and companies on your database, make sure that" " you select the right :guilabel:`Company` in the website settings, next to " @@ -2993,7 +3145,7 @@ msgid "" "use." msgstr "" -#: ../../content/administration/maintain/domain_names.rst:336 +#: ../../content/administration/maintain/domain_names.rst:366 msgid ":doc:`/applications/general/email_communication/email_servers`" msgstr "" @@ -3141,201 +3293,246 @@ msgid "" msgstr "" #: ../../content/administration/maintain/google_oauth.rst:15 +msgid ":doc:`/applications/general/auth/google`" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:16 +msgid ":doc:`/applications/productivity/calendar/google`" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:19 msgid "Setup in Google" msgstr "Opzet in Google" -#: ../../content/administration/maintain/google_oauth.rst:18 +#: ../../content/administration/maintain/google_oauth.rst:22 msgid "Create a new project" msgstr "Maak een nieuw project aan" -#: ../../content/administration/maintain/google_oauth.rst:20 +#: ../../content/administration/maintain/google_oauth.rst:24 msgid "" -"To get started, go to the `Google API Platform " -"<https://console.cloud.google.com/apis/credentials/consent>`_. Log in with " -"your *Google Workspace* account if you have one, otherwise log in with your " -"personal Gmail account (this should match the email address you want to " -"configure in Odoo)." +"To get started, go to the `Google API Console " +"<https://console.developers.google.com>`_. Log in with your *Google " +"Workspace* account if you have one, otherwise log in with your personal " +"Gmail account (this should match the email address you want to configure in " +"Odoo)." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:25 +#: ../../content/administration/maintain/google_oauth.rst:28 msgid "" "After that, click on :guilabel:`Create Project`, located on the far right of" -" the OAuth consent screen. If a project has already been created in this " -"account, then the :guilabel:`New Project` option will be located on the top " -"left under the :guilabel:`Select a project` drop-down menu." +" the :guilabel:`OAuth consent screen`. If a project has already been created" +" in this account, then the :guilabel:`New Project` option will be located on" +" the top right under the :guilabel:`Select a project` drop-down menu." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:29 +#: ../../content/administration/maintain/google_oauth.rst:33 msgid "" -"On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` " -"to `Odoo` and browse for the :guilabel:`Location`. Set the " -":guilabel:`Location` as the `Google Workspace` organization. If you are " -"using a personal Gmail account, then leave the :guilabel:`Location` as `No " -"Organization`." +"On the :menuselection:`New Project` screen, rename the :guilabel:`Project " +"name` to `Odoo` and browse for the :guilabel:`Location`. Set the " +":guilabel:`Location` as the *Google Workspace organization*. If you are " +"using a personal Gmail account, then leave the :guilabel:`Location` as " +":guilabel:`No Organization`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone -msgid "Project Name and Location for Google Oauth." -msgstr "" - -#: ../../content/administration/maintain/google_oauth.rst:37 -msgid "" -"Click on :guilabel:`Create` to finish this step. On the next screen, " -":guilabel:`User Type` options, select the :guilabel:`External` option, and " -"then click on :guilabel:`Create` again, which will finally navigate to the " -":guilabel:`Edit app registration` page." +#: ../../content/administration/maintain/google_oauth.rst-1 +msgid "Project Name and Location for Google OAuth." msgstr "" #: ../../content/administration/maintain/google_oauth.rst:42 +msgid "Click on :guilabel:`Create` to finish this step." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:45 +msgid "OAuth consent screen" +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:47 +msgid "" +"If the page doesn't redirect to the :menuselection:`User Type` options, " +"click on :guilabel:`OAuth consent screen` in the left menu." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:50 +msgid "" +"Under :guilabel:`User Type` options, select the appropriate :guilabel:`User " +"Type`, and then click on :guilabel:`Create` again, which will finally " +"navigate to the :menuselection:`Edit app registration` page." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:55 +msgid "" +"*Personal* Gmail Accounts are only allowed to be **External** User Type, " +"which means Google may require an approval, or for *Scopes* to be added on. " +"However, using a *Google WorkSpace* account allows for **Internal** User " +"Type to be used." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:59 +msgid "" +"Note, as well, that while the API connection is in the *External* testing " +"mode, then no approval is necessary from Google. User limits in this testing" +" mode is set to 100 users." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:63 msgid "Edit app registration" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:44 +#: ../../content/administration/maintain/google_oauth.rst:65 +msgid "Next we will configure the app registration of the project." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:67 msgid "" -"On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App " +"On the :guilabel:`OAuth consent screen` step, under the :guilabel:`App " "information` section, enter `Odoo` in the :guilabel:`App name` field. Select" " the organization's email address under the :guilabel:`User support` email " "field." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:47 +#: ../../content/administration/maintain/google_oauth.rst:71 msgid "" "Next, under :menuselection:`App Domain --> Authorized domains`, click on " ":guilabel:`Add Domain` and enter `odoo.com`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:49 +#: ../../content/administration/maintain/google_oauth.rst:74 msgid "" "After that, under the :guilabel:`Developer contact information` section, " "enter the organization's email address. Google uses this email address to " "notify the organization about any changes to your project." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:52 -msgid "Next, click on the :guilabel:`Save and Continue` button." -msgstr "" - -#: ../../content/administration/maintain/google_oauth.rst:53 +#: ../../content/administration/maintain/google_oauth.rst:78 msgid "" -"Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and " -"clicking on :guilabel:`Save and Continue`." +"Next, click on the :guilabel:`Save and Continue` button. Then, skip the " +":menuselection:`Scopes` page by scrolling to the bottom and clicking on " +":guilabel:`Save and Continue`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:55 +#: ../../content/administration/maintain/google_oauth.rst:81 msgid "" -"Next, add the email being configured under the :guilabel:`Test users` step " -"by clicking on :guilabel:`Add Users` and then the :guilabel:`Save and " -"Continue` button. A summary of the :guilabel:`App registration` appears." +"If continuing in testing mode (External), add the email addresses being " +"configured under the :guilabel:`Test users` step, by clicking on " +":guilabel:`Add Users`, and then the :guilabel:`Save and Continue` button. A " +"summary of the app registration appears." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:58 +#: ../../content/administration/maintain/google_oauth.rst:85 msgid "" -"Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`." +"Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard` to " +"finish setting up the project." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:61 +#: ../../content/administration/maintain/google_oauth.rst:89 msgid "Create Credentials" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:63 +#: ../../content/administration/maintain/google_oauth.rst:91 msgid "" -"Now that you have set up the project, you need to create credentials, which " -"includes the :guilabel:`Client ID` and :guilabel:`Client Secret`. First, " -"click on :guilabel:`Credentials` in the left sidebar menu." +"Now that the project is set up, credentials should be created, which " +"includes the *Client ID* and *Client Secret*. First, click on " +":guilabel:`Credentials` in the left sidebar menu." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:67 +#: ../../content/administration/maintain/google_oauth.rst:94 msgid "" "Then, click on :guilabel:`Create Credentials` in the top menu and select " ":guilabel:`OAuth client ID` from the dropdown menu." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:70 +#: ../../content/administration/maintain/google_oauth.rst:97 msgid "" "Under :guilabel:`Application Type`, select :guilabel:`Web Application` from " "the dropdown menu." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:71 -msgid "In the :guilabel:`Client ID` field, enter `Odoo`." +#: ../../content/administration/maintain/google_oauth.rst:98 +msgid "In the :guilabel:`Name` field, enter `Odoo`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:72 +#: ../../content/administration/maintain/google_oauth.rst:99 msgid "" "Under the :guilabel:`Authorized redirect URIs` label, click the button " ":guilabel:`ADD URI`, and then input " "`https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1`" -" field. Be sure to replace the *yourdbname* part of the URL with your actual" -" Odoo database name." +" field. Be sure to replace the *yourdbname* part of the URL with the actual " +"Odoo database name." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:75 +#: ../../content/administration/maintain/google_oauth.rst:102 msgid "" "Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID`" " and :guilabel:`Client Secret`. Finally, copy each generated value for later" " use when configuring in Odoo, and then navigate to the Odoo database." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "Client ID and Client Secret for Google OAuth." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:87 +#: ../../content/administration/maintain/google_oauth.rst:114 msgid "Enter Google Credentials" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:89 +#: ../../content/administration/maintain/google_oauth.rst:116 msgid "" "First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove " "the :guilabel:`Apps` filter from the search bar and type in `Google`. " "Install the module called :guilabel:`Google Gmail`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:92 +#: ../../content/administration/maintain/google_oauth.rst:120 msgid "" "Next, navigate to :menuselection:`Settings --> General Settings`, and under " "the :guilabel:`Discuss` section, ensure that the checkbox for " -":guilabel:`Custom Email Servers` is checked. This populates a new option for" -" :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client " -"ID` and :guilabel:`Client Secret` into the respective fields and " +":guilabel:`Custom Email Servers` or :guilabel:`External Email Servers` is " +"checked. This populates a new option for :guilabel:`Gmail Credentials` or " +":guilabel:`Use a Gmail Sever`. Then, copy and paste the respective values " +"into the :guilabel:`Client ID` and :guilabel:`Client Secret` fields and " ":guilabel:`Save` the settings." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:100 +#: ../../content/administration/maintain/google_oauth.rst:129 msgid "" -"After that, on the :guilabel:`General Settings` page, under " -":guilabel:`Custom Email Servers`, click :guilabel:`Outgoing Email Servers` " -"to configure the external Gmail account." +"To configure the external Gmail account, return to the top of the " +":guilabel:`Custom Email Servers` setting and then click the " +":guilabel:`Outgoing Email Servers` link." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "Configure Outgoing Email Servers in Odoo." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:107 +#: ../../content/administration/maintain/google_oauth.rst:136 msgid "" -"Then, :guilabel:`Create` a new email server and select the option for " -":guilabel:`Gmail`. Next, fill in the :guilabel:`Description` (can be " -"anything) and the email :guilabel:`Username` and click on :guilabel:`Connect" -" your Gmail account`." +"Then, click on :guilabel:`New` or :guilabel:`Create` to create a new email " +"server, and fill in the :guilabel:`Name`, :guilabel:`Description`, and the " +"email :guilabel:`Username` (if required)." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:111 +#: ../../content/administration/maintain/google_oauth.rst:139 msgid "" -"A new window from :guilabel:`Google` opens to complete the authorization " +"Next, click on :guilabel:`Gmail OAuth Authentication` or :guilabel:`Gmail` " +"(under the :guilabel:`Authenticate with` or :guilabel:`Connection` section)." +" Finally, click on :guilabel:`Connect your Gmail Account`." +msgstr "" + +#: ../../content/administration/maintain/google_oauth.rst:143 +msgid "" +"A new window labeled :guilabel:`Google` opens to complete the authorization " "process. Select the appropriate email address that is being configured in " "Odoo." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:114 +#: ../../content/administration/maintain/google_oauth.rst:146 msgid "" -"If the email address is a personal account, an extra step pops up, click " -":guilabel:`Continue` to allow the verification and connect the Gmail account" -" to Odoo." +"If the email address is a personal account, then an extra step pops up, so " +"click :guilabel:`Continue` to allow the verification and connect the Gmail " +"account to Odoo." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:117 +#: ../../content/administration/maintain/google_oauth.rst:149 msgid "" "Then, allow Odoo to access the Google account by clicking on " ":guilabel:`Continue` or :guilabel:`Allow`. After that, the page navigates " @@ -3344,32 +3541,32 @@ msgid "" ":guilabel:`Gmail Token Valid` appears in green." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:126 +#: ../../content/administration/maintain/google_oauth.rst:158 msgid "" -"Finally, save the settings and :guilabel:`Test the Connection`. A " -"confirmation message should appear. The Odoo database can now send safe, " -"secure emails through Google using OAuth authentication." +"Finally, :guilabel:`Test the Connection`. A confirmation message should " +"appear. The Odoo database can now send safe, secure emails through Google " +"using OAuth authentication." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:131 +#: ../../content/administration/maintain/google_oauth.rst:162 msgid "Google OAuth FAQ" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:134 +#: ../../content/administration/maintain/google_oauth.rst:165 msgid "Production VS Testing Publishing Status" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:136 +#: ../../content/administration/maintain/google_oauth.rst:167 msgid "" "Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` " -"(instead of Testing) will display the following warning message:" +"(instead of :guilabel:`Testing`) will display the following warning message:" msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "OAuth is Limited to 100 Sensitive Scope Logins." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:143 +#: ../../content/administration/maintain/google_oauth.rst:174 msgid "" "To correct this warning, navigate to the `Google API Platform " "<https://console.cloud.google.com/apis/credentials/consent>`_. If the " @@ -3377,76 +3574,73 @@ msgid "" ":guilabel:`Back to Testing` to correct the issue." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:148 +#: ../../content/administration/maintain/google_oauth.rst:179 msgid "No Test Users Added" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:150 +#: ../../content/administration/maintain/google_oauth.rst:181 msgid "" "If no test users are added to the OAuth consent screen, then a 403 access " "denied error will populate." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "403 Access Denied Error." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:157 +#: ../../content/administration/maintain/google_oauth.rst:188 msgid "" "To correct this error, return to the :guilabel:`OAuth consent screen` under " ":guilabel:`APIs & Services` and add test user(s) to the app. Add the email " "that you are configuring in Odoo." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:162 +#: ../../content/administration/maintain/google_oauth.rst:192 msgid "Gmail Module not updated" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:164 +#: ../../content/administration/maintain/google_oauth.rst:194 msgid "" -"If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest " +"If the *Google Gmail* module in Odoo has not been updated to the latest " "version, then a :guilabel:`Forbidden` error message populates." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "" "Forbidden you don't have the permission to access the requested resource." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:171 +#: ../../content/administration/maintain/google_oauth.rst:201 msgid "" -"To correct this error, go to the :guilabel:`Apps` module and clear out the " -"search terms. Then, search for `Gmail` or `Google` and upgrade the " +"To correct this error, go to the :menuselection:`Apps` module and clear out " +"the search terms. Then, search for `Gmail` or `Google` and upgrade the " ":guilabel:`Google Gmail` module. Finally, click on the three dots on the " "upper right of the module and select :guilabel:`Upgrade`." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:176 +#: ../../content/administration/maintain/google_oauth.rst:206 msgid "Application Type" msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:178 +#: ../../content/administration/maintain/google_oauth.rst:208 msgid "" -"When creating the :guilabel:`Credentials` (OAuth Client ID and Client " -"Secret), if :guilabel:`Desktop App` is selected for the " -":guilabel:`Application Type`, an :guilabel:`Authorization Error` appears." +"When creating the credentials (OAuth *Client ID* and *Client Secret*), if " +":guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an" +" :guilabel:`Authorization Error` appears." msgstr "" -#: ../../content/administration/maintain/google_oauth.rstNone +#: ../../content/administration/maintain/google_oauth.rst-1 msgid "Error 400 Redirect URI Mismatch." msgstr "" -#: ../../content/administration/maintain/google_oauth.rst:186 +#: ../../content/administration/maintain/google_oauth.rst:215 msgid "" "To correct this error, delete the credentials already created and create new" " credentials, selecting :guilabel:`Web Application` for the " ":guilabel:`Application Type`. Then, under :guilabel:`Authorized redirect " "URIs`, click :guilabel:`ADD URI` and type: " -"`https://yourdbname.odoo.com/google_gmail/confirm` in the field." -msgstr "" - -#: ../../content/administration/maintain/google_oauth.rst:192 -msgid "Replace *yourdbname* in the URL with the Odoo database name." +"`https://yourdbname.odoo.com/google_gmail/confirm` in the field, being sure " +"to replace *yourdbname* in the URL with the Odoo database name." msgstr "" #: ../../content/administration/maintain/hosting_changes.rst:6 @@ -3700,7 +3894,7 @@ msgid "" "API Settings`." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "" "SMTP and Send API Settings link in the Senders & Domains section of Mailjet." msgstr "" @@ -3729,7 +3923,7 @@ msgid "" "reference here <email_servers/restriction>`." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "SMTP configuration from Mailjet." msgstr "" @@ -3762,7 +3956,7 @@ msgid "" "section." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "Add a sender domain or address in the Mailjet interface." msgstr "" @@ -3881,7 +4075,7 @@ msgid "" "System)` provider to complete validation." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "The TXT record information to input on the domain's DNS." msgstr "" @@ -3926,7 +4120,7 @@ msgid "" "correctly." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "Check DNS record in Mailjet." msgstr "" @@ -3938,7 +4132,7 @@ msgid "" "Mail) records to input into the :abbr:`DNS (Domain Name System)` provider." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "Authenticate the domain with SPF/DKIM records in Mailjet." msgstr "" @@ -3981,7 +4175,7 @@ msgid "" "server(s). Finally, save the settings and :guilabel:`Test the Connection`." msgstr "" -#: ../../content/administration/maintain/mailjet_api.rstNone +#: ../../content/administration/maintain/mailjet_api.rst-1 msgid "Odoo outgoing email server settings." msgstr "" @@ -3996,7 +4190,7 @@ msgid "" "The :guilabel:`From Filter` needs to be set on the server configuration. It " "is recommended to set it as a domain and not a full email address. It should" " match the domain in the two proceeding steps. More information can be " -"referenced :ref:`here <email_servers/outgoing-email-server>`." +"referenced :ref:`here <email_communication/from_filter>`." msgstr "" #: ../../content/administration/maintain/mailjet_api.rst:205 @@ -4033,268 +4227,270 @@ msgstr "" msgid "" "To manage a database, sign in to https://www.odoo.com and access the " "`database management page <https://www.odoo.com/my/databases>`_ by clicking " -"on the user icon, then on *My Databases*." +"on the user icon, then on :guilabel:`My Databases`." msgstr "" -#: ../../content/administration/maintain/odoo_online.rstNone +#: ../../content/administration/maintain/odoo_online.rst-1 msgid "" "Clicking on the user icon opens a drop-down menu. \"My databases\" button is" " highlighted." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:13 +#: ../../content/administration/maintain/odoo_online.rst:14 msgid "" -"Make sure you are connected as the administrator of the database you want to" -" manage." +"Make sure to connect as the administrator of the database that changes will " +"be made on." msgstr "" -#: ../../content/administration/maintain/odoo_online.rstNone +#: ../../content/administration/maintain/odoo_online.rst-1 msgid "Clicking on the gear icon opens the drop-down menu." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:19 +#: ../../content/administration/maintain/odoo_online.rst:20 msgid "" -"Open the drop-down menu next to the database you want to manage by clicking " -"on the gear icon." +"Open the drop-down menu next to the database that changes will be made on by" +" clicking on the gear icon." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:21 +#: ../../content/administration/maintain/odoo_online.rst:23 msgid "Several actions are available:" msgstr "Meerdere acties zijn mogelijk:" -#: ../../content/administration/maintain/odoo_online.rst:23 +#: ../../content/administration/maintain/odoo_online.rst:25 msgid ":ref:`odoo_online/upgrade`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:24 +#: ../../content/administration/maintain/odoo_online.rst:26 msgid ":ref:`odoo_online/duplicate`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:25 +#: ../../content/administration/maintain/odoo_online.rst:27 msgid ":ref:`odoo_online/rename`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:26 +#: ../../content/administration/maintain/odoo_online.rst:28 msgid ":ref:`odoo_online/download`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:27 +#: ../../content/administration/maintain/odoo_online.rst:29 msgid ":ref:`odoo_online/domains`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:28 +#: ../../content/administration/maintain/odoo_online.rst:30 msgid ":ref:`odoo_online/tags`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:29 +#: ../../content/administration/maintain/odoo_online.rst:31 msgid ":ref:`odoo_online/delete`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:30 +#: ../../content/administration/maintain/odoo_online.rst:32 msgid ":ref:`odoo_online/contact-support`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:31 +#: ../../content/administration/maintain/odoo_online.rst:33 msgid ":ref:`odoo_online/users`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:36 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:285 +#: ../../content/administration/maintain/odoo_online.rst:38 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Bijwerken" -#: ../../content/administration/maintain/odoo_online.rst:38 +#: ../../content/administration/maintain/odoo_online.rst:40 msgid "" -"If you are *not* on the latest **Online version**, you should receive an " -"invitation to :doc:`upgrade <../upgrade>` your database. A **Rolling Release" -" button** on your database's main screen proposes an upgrade to the latest " -"version (e.g., 13.0 to 15.1)." +"If the database is *not* on the latest **Online version**, the administrator" +" should receive an invitation to :doc:`upgrade <../upgrade>` the database. A" +" :guilabel:`Rolling Release`` button on the database's main screen proposes " +"an upgrade to the latest version (e.g., 14.0 to 16.1)." msgstr "" #: ../../content/administration/maintain/odoo_online.rst:0 msgid "" -"**If your Odoo database's version is lower than the latest major release:**" +"**If the Odoo database's version is lower than the latest major release:**" msgstr "" #: ../../content/administration/maintain/odoo_online.rst:0 msgid "" -"You must upgrade your database within two months. After these two months, an" -" automatic upgrade is initiated." +"The database must be upgraded within two months. After these two months, an " +"automatic upgrade is initiated." msgstr "" #: ../../content/administration/maintain/odoo_online.rst:0 msgid "" -"**If your Odoo database's version is equal to or higher than the latest " -"major release:**" +"**If the Odoo database's version is equal to or higher than the latest major" +" release:**" msgstr "" #: ../../content/administration/maintain/odoo_online.rst:0 msgid "" -"You can disregard the invitation to upgrade as you probably wouldn't benefit" -" from new features every two months." +"Disregard the invitation to upgrade as the database probably wouldn't " +"benefit from new features every two months." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:51 +#: ../../content/administration/maintain/odoo_online.rst:53 msgid "" "Versions that are not supported anymore become deprecated and need to be " -"updated to avoid security issues. We recommend you initiate the upgrade of " -"the database yourself, as this method allows you to request a test upgrade " -"of your database to check for any discrepancies." +"updated to avoid security issues. Odoo recommends that the company initiate " +"the upgrade, as this method allows for the company to request a test upgrade" +" of the database to check for any discrepancies." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:56 +#: ../../content/administration/maintain/odoo_online.rst:58 msgid ":doc:`../upgrade`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:57 +#: ../../content/administration/maintain/odoo_online.rst:59 msgid ":doc:`supported_versions`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:62 +#: ../../content/administration/maintain/odoo_online.rst:64 msgid "Duplicate" msgstr "Dupliceren" -#: ../../content/administration/maintain/odoo_online.rst:64 +#: ../../content/administration/maintain/odoo_online.rst:66 msgid "" -"Make an exact copy of the database to be able to perform testing without " -"compromising the daily operations." -msgstr "" - -#: ../../content/administration/maintain/odoo_online.rst:68 -msgid "" -"By checking *For testing purposes*, all external communication (emails, " -"payments, delivery orders, etc.) are disabled by default on the duplicated " -"database." +"This allows to make an exact copy of the database to be able to perform " +"testing without compromising the daily operations." msgstr "" #: ../../content/administration/maintain/odoo_online.rst:70 +msgid "" +"By checking :guilabel:`For testing purposes`, all external communication " +"(emails, payments, delivery orders, etc.) are disabled by default on the " +"duplicated database." +msgstr "" + +#: ../../content/administration/maintain/odoo_online.rst:72 msgid "Duplicate databases expire automatically after 15 days." msgstr "Gedupliceerde databases verlopen automatisch na 15 dagen." -#: ../../content/administration/maintain/odoo_online.rst:75 +#: ../../content/administration/maintain/odoo_online.rst:77 msgid "Rename" msgstr "Naam wijzigen" -#: ../../content/administration/maintain/odoo_online.rst:77 +#: ../../content/administration/maintain/odoo_online.rst:79 msgid "Rename the database and its URL." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:82 +#: ../../content/administration/maintain/odoo_online.rst:84 msgid "Download" msgstr "Downloaden" -#: ../../content/administration/maintain/odoo_online.rst:84 -msgid "Download instantly a ZIP file with a backup of the database." +#: ../../content/administration/maintain/odoo_online.rst:86 +msgid "Instantly download a ZIP file with a backup of the database." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:87 +#: ../../content/administration/maintain/odoo_online.rst:89 msgid "" "Databases are backed up daily according to the `Odoo Cloud SLA " "<https://www.odoo.com/cloud-sla>`_." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:93 +#: ../../content/administration/maintain/odoo_online.rst:95 msgid "Domains" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:95 +#: ../../content/administration/maintain/odoo_online.rst:97 msgid "Configure custom domains to access the database via another URL." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:98 +#: ../../content/administration/maintain/odoo_online.rst:100 msgid ":doc:`domain_names`" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:103 +#: ../../content/administration/maintain/odoo_online.rst:105 msgid "Tags" msgstr "Labels" -#: ../../content/administration/maintain/odoo_online.rst:105 +#: ../../content/administration/maintain/odoo_online.rst:107 msgid "" "Add tags to sort your databases out. You can search the tags in the search " "bar." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:110 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:539 +#: ../../content/administration/maintain/odoo_online.rst:112 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:550 msgid "Delete" msgstr "Verwijderen" -#: ../../content/administration/maintain/odoo_online.rst:112 +#: ../../content/administration/maintain/odoo_online.rst:114 msgid "Delete a database instantly." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:115 +#: ../../content/administration/maintain/odoo_online.rst:117 msgid "" "Deleting a database means that all data is permanently lost. The deletion is" " instant and for all users. It is recommended to create a backup of the " "database before deleting it." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:118 +#: ../../content/administration/maintain/odoo_online.rst:120 msgid "" -"Read carefully the warning message that pops up and proceed only if you " -"fully understand the implications of deleting a database:" +"Carefully read the warning message that pops up and proceed only if the " +"implications of deleting a database are fully understood:" msgstr "" -#: ../../content/administration/maintain/odoo_online.rstNone +#: ../../content/administration/maintain/odoo_online.rst-1 msgid "A warning message is prompted before deleting a database." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:126 +#: ../../content/administration/maintain/odoo_online.rst:128 msgid "Only an administrator can delete a database." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:127 +#: ../../content/administration/maintain/odoo_online.rst:129 msgid "The database name is immediately available for a new database." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:128 +#: ../../content/administration/maintain/odoo_online.rst:130 msgid "" "It is not possible to delete a database if it is expired or linked to a " "subscription. If needed, please get in touch with `Odoo Support " "<https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:130 -msgid "" -"To delete your account, please get in touch with `Odoo Support " -"<https://www.odoo.com/help>`_." -msgstr "" - -#: ../../content/administration/maintain/odoo_online.rst:135 +#: ../../content/administration/maintain/odoo_online.rst:136 msgid "Contact Support" msgstr "Neem contact op met support" -#: ../../content/administration/maintain/odoo_online.rst:137 +#: ../../content/administration/maintain/odoo_online.rst:138 msgid "" "Access the Odoo `support page <https://www.odoo.com/help>`_ with your " "database's details already pre-filled." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:143 +#: ../../content/administration/maintain/odoo_online.rst:144 msgid "Invite / Remove Users" msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:145 +#: ../../content/administration/maintain/odoo_online.rst:146 msgid "" "To invite users, fill out the email address of the new user and click on " -"*Invite*. To add multiple users, click on *Add more users*." +":guilabel:`Invite`. To add multiple users, click on :guilabel:`Add more " +"users`." msgstr "" -#: ../../content/administration/maintain/odoo_online.rstNone +#: ../../content/administration/maintain/odoo_online.rst-1 msgid "Clicking on \"Add more users\" adds additional email fields." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:152 -msgid "To remove users, select the users to remove and click on *Remove*." +#: ../../content/administration/maintain/odoo_online.rst:153 +msgid "" +"To remove users, select the users to remove and click on :guilabel:`Remove`." msgstr "" -#: ../../content/administration/maintain/odoo_online.rst:155 +#: ../../content/administration/maintain/odoo_online.rst:156 msgid ":doc:`/applications/general/users/manage_users`" msgstr "" +#: ../../content/administration/maintain/odoo_online.rst:157 +msgid ":doc:`/applications/general/users/delete_account`" +msgstr "" + #: ../../content/administration/maintain/on_premise.rst:3 msgid "On-premise database management" msgstr "" @@ -4325,15 +4521,15 @@ msgstr "" "Indien u uw database niet kan registreren krijgt u waarschijnlijk de " "volgende melding:" -#: ../../content/administration/maintain/on_premise.rstNone +#: ../../content/administration/maintain/on_premise.rst-1 msgid "" -"Something went wrong while registering your database,\n" -"you can try again or contact Odoo Help" +"Something went wrong while registering your database, you can try again or contact Odoo\n" +"Help" msgstr "" #: ../../content/administration/maintain/on_premise.rst:27 -#: ../../content/administration/maintain/on_premise.rst:106 -#: ../../content/administration/maintain/on_premise.rst:134 +#: ../../content/administration/maintain/on_premise.rst:100 +#: ../../content/administration/maintain/on_premise.rst:127 msgid "Solutions" msgstr "Oplossingen" @@ -4368,7 +4564,7 @@ msgstr "" "<https://accounts.odoo.com/my/subscription>`__ met de \"Unlink database\" " "knop" -#: ../../content/administration/maintain/on_premise.rst:48 +#: ../../content/administration/maintain/on_premise.rst:47 msgid "" "A confirmation message will appear; make sure this is the correct database " "as it will be deactivated shortly:" @@ -4376,18 +4572,18 @@ msgstr "" "Een bevestigingsbericht zal verschijnen; zorg ervoor dat dit zeker de " "correcte database is en ze wordt binnenkort gedeactiveerd:" -#: ../../content/administration/maintain/on_premise.rst:55 +#: ../../content/administration/maintain/on_premise.rst:53 msgid "Do you have the updated version of Odoo 9?" msgstr "Heeft u de geüpdatet versie van Odoo 9?" -#: ../../content/administration/maintain/on_premise.rst:57 -#: ../../content/administration/maintain/on_premise.rst:167 +#: ../../content/administration/maintain/on_premise.rst:55 +#: ../../content/administration/maintain/on_premise.rst:159 msgid "" "From July 2016 onward, Odoo 9 now automatically change the uuid of a " "duplicated database; a manual operation is no longer required." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:60 +#: ../../content/administration/maintain/on_premise.rst:58 msgid "" "If it's not the case, you may have multiple databases sharing the same UUID." " Please check on your `Odoo Contract " @@ -4395,50 +4591,50 @@ msgid "" "specifying which database is problematic:" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:69 +#: ../../content/administration/maintain/on_premise.rst:66 msgid "" "In this case, you need to change the UUID on your test databases to solve " "this issue. You will find more information about this in :ref:`this section " "<duplicate_premise>`." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:72 +#: ../../content/administration/maintain/on_premise.rst:69 msgid "" "For your information, we identify database with UUID. Therefore, each " "database should have a distinct UUID to ensure that registration and " "invoicing proceed effortlessly for your and for us." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:76 +#: ../../content/administration/maintain/on_premise.rst:73 msgid "Check your network and firewall settings" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:78 +#: ../../content/administration/maintain/on_premise.rst:75 msgid "" "The Update notification must be able to reach Odoo's subscription validation" " servers. In other words, make sure that the Odoo server is able to open " "outgoing connections towards:" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:82 +#: ../../content/administration/maintain/on_premise.rst:79 msgid "services.odoo.com on port 443 (or 80)" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:83 +#: ../../content/administration/maintain/on_premise.rst:80 msgid "services.openerp.com on port 443 (or 80) for older deployments" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:85 +#: ../../content/administration/maintain/on_premise.rst:82 msgid "" "Once you activated your database, you must keep these ports open, as the " "Update notification runs once a week." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:91 +#: ../../content/administration/maintain/on_premise.rst:86 msgid "Error message due to too many users" msgstr "Foutmelding vanwege te veel gebruikers" -#: ../../content/administration/maintain/on_premise.rst:93 +#: ../../content/administration/maintain/on_premise.rst:88 msgid "" "If you have more users in your local database than provisionned in your Odoo" " Enterprise subscription, you may encounter this message:" @@ -4446,13 +4642,13 @@ msgstr "" "Indien u meer gebruikers in uw lokale database heeft dan toegewezen in uw " "Odoo Enterprise abonnement kan u deze melding krijgen:" -#: ../../content/administration/maintain/on_premise.rstNone +#: ../../content/administration/maintain/on_premise.rst-1 msgid "" -"This database will expire in X days, you\n" -"have more users than your subscription allows" +"This database will expire in X days, you have more users than your " +"subscription allows" msgstr "" -#: ../../content/administration/maintain/on_premise.rst:102 +#: ../../content/administration/maintain/on_premise.rst:96 msgid "" "When the message appears you have 30 days before the expiration. The " "countdown is updated everyday." @@ -4460,20 +4656,20 @@ msgstr "" "Wanneer het bericht verschijnt heeft u 30 dagen voordat de database vervalt." " De teller wordt elke dag geüpdatet." -#: ../../content/administration/maintain/on_premise.rst:108 +#: ../../content/administration/maintain/on_premise.rst:102 msgid "" "**Add more users** on your subscription: follow the link and Validate the " "upsell quotation and pay for the extra users." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:110 +#: ../../content/administration/maintain/on_premise.rst:104 msgid "" "**Deactivate users** as explained in this `documentation " "<documentation.html#deactivating-users>`_ and **Reject** the upsell " "quotation." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:113 +#: ../../content/administration/maintain/on_premise.rst:107 msgid "" "Once your database has the correct number of users, the expiration message " "will disappear automatically after a few days, when the next verification " @@ -4482,46 +4678,46 @@ msgid "" "message disappear right away." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:120 +#: ../../content/administration/maintain/on_premise.rst:114 msgid "Database expired error message" msgstr "Database vervallen foutmelding" -#: ../../content/administration/maintain/on_premise.rst:122 +#: ../../content/administration/maintain/on_premise.rst:116 msgid "" "If your database reaches its expiration date before your renew your " "subscription, you will encounter this message:" msgstr "" -#: ../../content/administration/maintain/on_premise.rstNone +#: ../../content/administration/maintain/on_premise.rst-1 msgid "This database has expired." msgstr "De database is vervallen." -#: ../../content/administration/maintain/on_premise.rst:130 +#: ../../content/administration/maintain/on_premise.rst:123 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 "" -#: ../../content/administration/maintain/on_premise.rst:138 +#: ../../content/administration/maintain/on_premise.rst:131 msgid "" "Renew your subscription: follow the link and renew your subscription - note " "that" msgstr "" "Vernieuw uw abonnement: volg de link en vernieuw uw abonnement - merk op dat" -#: ../../content/administration/maintain/on_premise.rst:137 +#: ../../content/administration/maintain/on_premise.rst:130 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 "" -#: ../../content/administration/maintain/on_premise.rst:140 +#: ../../content/administration/maintain/on_premise.rst:133 msgid "Contact our `Support <https://www.odoo.com/help>`__" msgstr "Contacteer onze `support <https://www.odoo.com/help>`__" -#: ../../content/administration/maintain/on_premise.rst:142 +#: ../../content/administration/maintain/on_premise.rst:135 msgid "" "None of those solutions worked for you? Please contact our `Support " "<https://www.odoo.com/help>`__" @@ -4529,18 +4725,18 @@ msgstr "" "Werkte deze oplossingen niet voor u? Contacteer dan onze `Support " "<https://www.odoo.com/help>`__" -#: ../../content/administration/maintain/on_premise.rst:151 +#: ../../content/administration/maintain/on_premise.rst:143 msgid "Duplicate a database" msgstr "Dupliceer een database" -#: ../../content/administration/maintain/on_premise.rst:153 +#: ../../content/administration/maintain/on_premise.rst:145 msgid "" "You can duplicate your database by accessing the database manager on your " "server (<odoo-server>/web/database/manager). In this page, you can easily " "duplicate your database (among other things)." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:161 +#: ../../content/administration/maintain/on_premise.rst:152 msgid "" "When you duplicate a local database, it is **strongly** advised to change " "the duplicated database's uuid (Unniversally Unique Identifier), since this " @@ -4549,7 +4745,7 @@ msgid "" "registration problems down the line." msgstr "" -#: ../../content/administration/maintain/on_premise.rst:170 +#: ../../content/administration/maintain/on_premise.rst:162 msgid "" "The database uuid is currently accessible from the menu " ":menuselection:`Settings --> Technical --> System Parameters`, we advise you" @@ -4603,264 +4799,344 @@ msgstr "" msgid "**Major releases are in bold type.**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "**Odoo 16.0**" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:37 #: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:38 #: ../../content/administration/maintain/supported_versions.rst:39 -msgid "October 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "October 2025 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "Odoo saas~15.2" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:50 #: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:62 +#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "Nvt" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "March 2022" +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "Odoo saas~15.1" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:39 #: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 +msgid "March 2023" +msgstr "" + #: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:48 +msgid "Odoo saas~16.1" +msgstr "" + #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 #: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "February 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "**Odoo 15.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2021" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "October 2024 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:37 -msgid "**Odoo 14.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:47 -msgid "October 2020" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:37 -msgid "October 2023 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:39 -msgid "**Odoo 13.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:53 -msgid "October 2019" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:41 -msgid "Odoo saas~12.3" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:41 -msgid "August 2019" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "**Odoo 12.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 -msgid "October 2018" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:45 -msgid "Odoo saas~11.3" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:45 -msgid "April 2018" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:47 -msgid "**Odoo 11.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 -msgid "October 2017" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:49 -msgid "Odoo 10.saas~15" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:49 -msgid "March 2017" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:51 -msgid "Odoo 10.saas~14" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:51 -msgid "January 2017" +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:53 -msgid "**Odoo 10.0**" +msgid "April 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:53 -msgid "October 2016" +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:55 -msgid "Odoo 9.saas~11" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:55 -msgid "May 2016" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:57 -msgid "**Odoo 9.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:57 -msgid "October 2015" +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:59 -msgid "Odoo 8.saas~6" +msgid "October 2025 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:59 -msgid "February 2015" +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 -msgid "**Odoo 8.0**" +#: ../../content/administration/maintain/supported_versions.rst:64 +msgid "March 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:61 -msgid "September 2014" +#: ../../content/administration/maintain/supported_versions.rst:65 +msgid "January 2023" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:66 -msgid "|green| Supported version" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:68 -msgid "|red| End-of-support" +msgid "Odoo saas~15.1" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:70 -msgid "N/A Never released for this platform" +msgid "February 2022" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:71 +msgid "July 2022" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:72 -msgid "🏁 Future version, not released yet" +msgid "**Odoo 15.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 +msgid "October 2021" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:77 +msgid "October 2024 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:78 +msgid "**Odoo 14.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 +msgid "October 2020" msgstr "" #: ../../content/administration/maintain/supported_versions.rst:83 +msgid "October 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:84 +msgid "**Odoo 13.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 +msgid "October 2019" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:90 +msgid "Odoo saas~12.3" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:94 +msgid "August 2019" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:96 +msgid "**Odoo 12.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 +msgid "October 2018" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:102 +msgid "Odoo saas~11.3" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:106 +msgid "April 2018" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:108 +msgid "**Odoo 11.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 +msgid "October 2017" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:114 +msgid "Odoo 10.saas~15" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:118 +msgid "March 2017" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:120 +msgid "Odoo 10.saas~14" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:124 +msgid "January 2017" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:126 +msgid "**Odoo 10.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:130 +msgid "October 2016" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:132 +msgid "Odoo 9.saas~11" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:136 +msgid "May 2016" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:138 +msgid "**Odoo 9.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:142 +msgid "October 2015" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:144 +msgid "Odoo 8.saas~6" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:148 +msgid "February 2015" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:150 +msgid "**Odoo 8.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:154 +msgid "September 2014" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:159 +msgid "|green| Supported version" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:161 +msgid "|red| End-of-support" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:163 +msgid "N/A Never released for this platform" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:165 +msgid "🏁 Future version, not released yet" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version <https://upgrade.odoo.com/>`_." @@ -5036,7 +5312,7 @@ msgstr "" msgid "Source Install (Tarball)" msgstr "" -#: ../../content/administration/maintain/update.rst:107 +#: ../../content/administration/maintain/update.rst:108 msgid "" "If you have originally installed Odoo with the \"tarball\" version (source " "code archive), you have to replace the installation directory with a newer " @@ -5045,7 +5321,7 @@ msgid "" "the package, extract it to a temporary location on your server." msgstr "" -#: ../../content/administration/maintain/update.rst:112 +#: ../../content/administration/maintain/update.rst:113 msgid "" "You will get a folder labelled with the version of the source code, for " "example \"odoo-13.0+e.20190719\", that contains a folder \"odoo.egg-info\" " @@ -5056,7 +5332,7 @@ msgid "" " just extracted." msgstr "" -#: ../../content/administration/maintain/update.rst:118 +#: ../../content/administration/maintain/update.rst:119 msgid "" "Be sure to match the folder layout, for example the new \"addons\" folder " "included in the source code should end up exactly at the same path it was " @@ -5066,11 +5342,11 @@ msgid "" " you are all set." msgstr "" -#: ../../content/administration/maintain/update.rst:125 +#: ../../content/administration/maintain/update.rst:126 msgid "Source Install (Github)" msgstr "" -#: ../../content/administration/maintain/update.rst:126 +#: ../../content/administration/maintain/update.rst:128 msgid "" "If you have originally installed Odoo with a full Github clone of the " "official repositories, the update procedure requires you to pull the latest " @@ -5079,7 +5355,7 @@ msgid "" "commands::" msgstr "" -#: ../../content/administration/maintain/update.rst:134 +#: ../../content/administration/maintain/update.rst:136 msgid "" "The last command may encounter source code conflicts if you had edited the " "Odoo source code locally. The error message will give you the list of files " @@ -5087,19 +5363,19 @@ msgid "" "editing them and deciding which part of the code to keep." msgstr "" -#: ../../content/administration/maintain/update.rst:138 +#: ../../content/administration/maintain/update.rst:140 msgid "" "Alternatively, if you prefer to simply discard the conflicting changes and " "restore the official version, you can use the following command::" msgstr "" -#: ../../content/administration/maintain/update.rst:143 +#: ../../content/administration/maintain/update.rst:145 msgid "" "Finally, restart the Odoo service or reboot the machine, and you should be " "done." msgstr "" -#: ../../content/administration/maintain/update.rst:149 +#: ../../content/administration/maintain/update.rst:151 msgid "" "Please refer to our `Docker image documentation " "<https://hub.docker.com/_/odoo/>`_ for specific update instructions." @@ -5115,12 +5391,12 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:7 #: ../../content/administration/odoo_sh/advanced/submodules.rst:9 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:7 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:6 #: ../../content/administration/odoo_sh/getting_started/builds.rst:9 #: ../../content/administration/odoo_sh/getting_started/first_module.rst:6 #: ../../content/administration/odoo_sh/getting_started/online-editor.rst:9 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:7 -#: ../../content/administration/odoo_sh/getting_started/status.rst:7 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:6 +#: ../../content/administration/odoo_sh/getting_started/status.rst:6 #: ../../content/administration/odoo_sh/overview.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:8 msgid "Overview" @@ -5283,7 +5559,7 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:169 msgid "" "More options are available and detailed in the :doc:`CLI documentation " -"</developer/cli>`." +"</developer/reference/cli>`." msgstr "" #: ../../content/administration/odoo_sh/advanced/containers.rst:172 @@ -5375,7 +5651,7 @@ msgid "" "code/function/method you want to debug." msgstr "" -#: ../../content/administration/odoo_sh/advanced/containers.rstNone +#: ../../content/administration/odoo_sh/advanced/containers.rst-1 msgid "Console screenshot showing ``pdb`` running in an Odoo.sh shell." msgstr "" @@ -5440,7 +5716,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "" @@ -5552,8 +5828,8 @@ msgstr "" #: ../../content/administration/odoo_sh/advanced/submodules.rst:82 #: ../../content/administration/odoo_sh/advanced/submodules.rst:94 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:364 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:502 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:360 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:498 msgid "Replace" msgstr "Vervangen" @@ -5614,35 +5890,35 @@ msgstr "" msgid "Get started" msgstr "Ga van start" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:4 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:3 msgid "Branches" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:9 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:8 msgid "" "The branches view gives you an overview of the different branches your " "repository has." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:17 -#: ../../content/administration/odoo_sh/getting_started/builds.rst:40 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:16 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:41 msgid "Stages" msgstr "Fases" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:19 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:18 msgid "" "Odoo.sh offers three different stages for your branches: production, staging" " and development." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:21 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:20 msgid "" "You can change the stage of a branch by drag and dropping it into the stage " "section title." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:29 -#: ../../content/administration/odoo_sh/getting_started/builds.rst:43 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:28 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:44 msgid "Production" msgstr "Productie" @@ -5671,7 +5947,7 @@ msgstr "" msgid "" "This method is equivalent to perform an upgrade of the module through the " "Apps menu, or through the :code:`-u` switch of :doc:`the command line " -"</developer/cli>`." +"</developer/reference/cli>`." msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:47 @@ -5698,11 +5974,11 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:61 -#: ../../content/administration/odoo_sh/getting_started/builds.rst:61 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:63 msgid "Staging" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:62 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:63 msgid "" "Staging branches are meant to test your new features using the production " "data without compromising the actual production database with test records. " @@ -5710,11 +5986,11 @@ msgid "" " database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:66 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:67 msgid "The neutralization includes:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:68 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:69 msgid "" "Disabling scheduled actions. If you want to test them, you can trigger their" " action manually or re-enable them. Be aware that the platform will trigger " @@ -5722,7 +5998,7 @@ msgid "" "resources." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:71 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:72 msgid "" "Disabling outgoing emails by intercepting them with a mailcatcher. An " ":ref:`interface to view <odoosh-gettingstarted-branches-tabs-mails>` the " @@ -5730,15 +6006,15 @@ msgid "" " about sending test emails to your contacts." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:74 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:75 msgid "Setting payment providers and shipping providers in test mode." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:75 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:76 msgid "Disabling IAP services" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:77 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:78 msgid "" "The latest database will be kept alive indefinitely, older ones from the " "same branch may get garbage collected to make room for new ones. It will be " @@ -5748,7 +6024,7 @@ msgid "" " data files overriding the default configuration or views." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:82 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:83 msgid "" "The unit tests are not performed as, in Odoo, they currently rely on the " "demo data, which is not loaded in the production database. In the future, if" @@ -5757,12 +6033,12 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 -#: ../../content/administration/odoo_sh/getting_started/builds.rst:80 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:52 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "Ontwikkeling" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:89 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:90 msgid "" "Development branches create new databases using the demo data to run the " "unit tests. The installed modules are the ones included in your branches. " @@ -5770,7 +6046,7 @@ msgid "" "Settings <odoosh-gettingstarted-settings-modules-installation>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:93 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:94 msgid "" "When you push a new commit in one of these branches, a new server is " "started, with a database created from scratch and the new revision of the " @@ -5781,89 +6057,89 @@ msgid "" "gettingstarted-branches-tabs-settings>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:100 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:101 msgid "" "Similar to staging branches, the emails are not sent but are intercepted by " "a mailcatcher and scheduled actions are not triggered as often is the " "database is not in use." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:103 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:104 msgid "" "The databases created for development branches are meant to live around " "three days. After that, they can be automatically garbage collected to make " "room for new databases without prior notice." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:109 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:110 msgid "Merging your branches" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:110 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:112 msgid "" "You can merge your branches easily by drag and dropping them into each " "other." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:115 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:117 msgid "" "When you want to test the changes of your development branches with the " "production data, you can either:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:118 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:120 msgid "" "merge the development branch into your staging branch, by drag and dropping " "it onto the desired staging branch," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:119 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:121 msgid "" "drag and dropping the development branch on the staging section title, to " "make it become a staging branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:121 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:123 msgid "" "When your latest changes are ready for production, you can drag and drop " "your staging branch onto your production branch to merge and deploy in " "production your newest features." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:125 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:127 msgid "" "If you are bold enough, you can merge your development branches into your " "production branch as well. It just means you skip the validation of your " "changes with the production data through a staging branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:129 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:131 msgid "" "You can merge your development branches into each other, and your staging " "branches into each other." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:131 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:133 msgid "" "Of course, you can also use :code:`git merge` directly on your workstation " "to merge your branches. Odoo.sh will be notified when new revisions have " "been pushed in your branches." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:134 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:136 msgid "" "Merging a staging branch in the production branch only merges the source " "code: Any configuration changes you made in the staging databases are not " "passed to the production database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:137 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:139 msgid "" "If you test configuration changes in staging branches, and want them to be " "applied in the production, you have to either:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:139 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:141 msgid "" "write the configuration changes in XML data files overriding the default " "configuration or views in your branches, and then increase the version of " @@ -5874,37 +6150,37 @@ msgid "" " therefore have a traceability for your changes." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:145 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:147 msgid "" "pass them manually from your staging to your production database, by " "copy/pasting them." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:150 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:152 msgid "Tabs" msgstr "Tabbladen" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:153 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:52 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:64 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "Geschiedenis" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:154 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:157 msgid "An overview of your branch history:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:156 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:159 msgid "The messages of the commits and their authors," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:157 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:160 msgid "" "The various events linked to the platform, such as stage changes, database " "imports, backup restores." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:162 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:165 msgid "" "For each event, a status is displayed in the top right-hand corner. It can " "provide information about the ongoing operation on the database " @@ -5913,13 +6189,13 @@ msgid "" "access the database thanks to the *connect* button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:170 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:60 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:72 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:173 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "E-mails" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:171 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:175 msgid "" "This tab contains the mail catcher. It displays an overview of the emails " "sent by your database. The mail catcher is available for your development " @@ -5927,127 +6203,127 @@ msgid "" "sent instead of being intercepted." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:180 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:184 msgid "Shell" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:181 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:186 msgid "" "A shell access to your container. You can perform basic linux commands " "(:code:`ls`, :code:`top`) and open a shell on your database by typing " ":code:`psql`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:187 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:203 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:192 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:208 msgid "" "You can open multiple tabs and drag-and-drop them to arrange the layout as " "you wish, for instance side by side." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:192 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:196 msgid "" "Long running shell instances are not guaranteed. Idle shells can be " "disconnected at anytime in order to free up resources." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:196 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:200 msgid "Editor" msgstr "Editor" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:197 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:202 msgid "" "An online integrated development environment (IDE) to edit the source code. " "You can also open terminals, Python consoles and even Odoo Shell consoles." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:207 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:212 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:208 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:214 msgid "This link contains various monitoring metrics of the current build." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:213 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:219 msgid "" "You can zoom, change the time range or select a specific metric on each " "graph. On the graphs, annotations help you relate to changes on the build " "(database import, git push, etc...)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:219 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:68 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:225 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "Logs" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:220 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:227 msgid "A viewer to have a look to your server logs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:225 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:232 msgid "Different logs are available:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:227 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:234 msgid "" "install.log: The logs of the database installation. In a development branch," " the logs of the tests are included." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:228 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:235 msgid "pip.log: The logs of the Python dependencies installation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:229 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:236 msgid "odoo.log: The logs of the running server." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:230 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:237 msgid "update.log: The logs of the database updates." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:231 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:238 msgid "" "pg_long_queries.log: The logs of psql queries that take an unusual amount of" " time." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:233 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:240 msgid "" "If new lines are added in the logs, they will be displayed automatically. If" " you scroll to the bottom, the browser will scroll automatically each time a" " new line is added." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:236 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:243 msgid "" "You can pause the logs fetching by clicking on the according button in the " "upper right corner of the view. The fetching is automatically stopped after " "5 minutes. You can restart it using the play button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:242 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:76 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:249 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:243 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:251 msgid "" "A list of the backups available for download and restore, the ability to " "perform a manual backup and to import a database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:249 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:257 msgid "" "Odoo.sh makes daily backups of the production database. It keeps 7 daily, 4 " "weekly and 3 monthly backups. Each backup includes the database dump, the " "filestore (attachments, binary fields), logs and sessions." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:252 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:260 msgid "" "Staging and development databases are not backed up. You nevertheless have " "the possibility to restore a backup of the production database in your " @@ -6055,21 +6331,21 @@ msgid "" " been deleted by accident from the production database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:256 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:264 msgid "" "The list contains the backups kept on the server your production database is" " hosted on. This server only keeps one month of backups: 7 daily and 4 " "weekly backups." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:259 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:267 msgid "" "Dedicated backup servers keep the same backups, as well as 3 additional " "monthly backups. To restore or download one of these monthly backups, please" " `contact us <https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:262 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:270 msgid "" "If you merge a commit updating the version of one or several modules (in " ":file:`__manifest__.py`), or their linked python dependencies (in " @@ -6080,7 +6356,7 @@ msgid "" "cases, we are doing a backup as it may potentially break things." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:268 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:276 msgid "" "If you merge a commit that only changes some code without the above-" "mentioned modifications, then no backup is done by Odoo.sh, as neither the " @@ -6091,59 +6367,59 @@ msgid "" "abuse, we limit manual backups to 5 per day." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:274 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:282 msgid "" "The *import database* feature accepts database archives in the format " "provided by:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:276 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:284 msgid "" "the standard Odoo databases manager, (available for on-premise Odoo servers " "under :code:`/web/database/manager`)" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:278 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:286 msgid "the Odoo online databases manager," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:279 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:287 msgid "the Odoo.sh backup download button of this *Backups* tab," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:280 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:288 msgid "" "the Odoo.sh dump download button in the :ref:`Builds view <odoosh-" "gettingstarted-builds>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:287 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:295 msgid "Available for production and staging branches for valid projects." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:290 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:298 msgid ":doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:295 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:4 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:303 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:3 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "Instellingen" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:297 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:305 msgid "" "Here you can find a couple of settings that only apply to the currently " "selected branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:302 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:310 msgid "**Behaviour upon new commit**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:304 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:312 msgid "" "For development and staging branches, you can change the branch's behavior " "upon receiving a new commit. By default, a development branch will create a " @@ -6156,48 +6432,48 @@ msgid "" "back from staging to development will automatically be set to 'Do nothing'." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:312 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:320 msgid "**Modules installation**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:314 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:322 msgid "" "Choose the modules to install automatically for your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:319 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:327 msgid "" "*Install only my modules* will install the modules of the branch only. This " "is the default option. The :ref:`submodules <odoosh-advanced-submodules>` " "are excluded." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:321 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:329 msgid "" "*Full installation (all modules)* will install the modules of the branch, " "the modules included in the submodules and all standard modules of Odoo. " "When running the full installation, the test suite is disabled." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:323 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:331 msgid "" "*Install a list of modules* will install the modules specified in the input " "just below this option. The names are the technical name of the modules, and" " they must be comma-separated." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:326 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:334 msgid "" "If the tests are enabled, the standard Odoo modules suite can take up to 1 " "hour. This setting applies to development builds only. Staging builds " "duplicate the production build and the production build only installs base." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:331 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:339 msgid "**Test suite**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:333 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:341 msgid "" "For development branches, you can choose to enable or disable the test " "suite. It's enabled by default. When the test suite is enabled, you can " @@ -6205,31 +6481,31 @@ msgid "" "<developer/reference/testing/selection>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:337 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:345 msgid "**Odoo Version**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:339 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:347 msgid "" "For development branches only, you can change the version of Odoo, should " "you want to test upgraded code or develop features while your production " "database is in the process of being upgraded to a newer version." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:342 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:350 msgid "" "In addition, for each version you have two options regarding the code " "update." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:344 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:352 msgid "" "You can choose to benefit from the latest bug, security and performance " "fixes automatically. The sources of your Odoo server will be updated weekly." " This is the 'Latest' option." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:346 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:354 msgid "" "You can choose to pin the Odoo sources to a specific revision by selecting " "them from a list of dates. Revisions will expire after 3 months. You will be" @@ -6237,75 +6513,75 @@ msgid "" "action afterwards, you will automatically be set to the latest revision." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:351 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:359 msgid "**Custom domains**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:353 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:361 msgid "" "Here you can configure additional domains for the selected branch. It's " "possible to add other *<name>.odoo.com* domains or your own custom domains. " "For the latter you have to:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:356 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:364 msgid "own or purchase the domain name," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:357 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:365 msgid "add the domain name in this list," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:358 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:366 msgid "" "in your registrar's domain name manager, configure the domain name with a " "``CNAME`` record set to your production database domain name." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:361 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:369 msgid "" "For instance, to associate *www.mycompany.com* to your database " "*mycompany.odoo.com*:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:363 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:371 msgid "" "in Odoo.sh, add *www.mycompany.com* in the custom domains of your project " "settings," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:364 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:372 msgid "" "in your domain name manager (e.g. *godaddy.com*, *gandi.net*, *ovh.com*), " "configure *www.mycompany.com* with a ``CNAME`` record with as value " "*mycompany.odoo.com*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:367 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:375 msgid "Bare domains (e.g. *mycompany.com*) are not accepted:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:369 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:377 msgid "they can only be configured using ``A`` records," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:370 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:378 msgid "``A`` records only accept IP addresses as value," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:371 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:379 msgid "" "the IP address of your database can change, following an upgrade, a hardware" " failure or your wish to host your database in another country or continent." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:374 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:382 msgid "" "Therefore, bare domains could suddenly no longer work because of this change" " of IP address." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:376 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:384 msgid "" "In addition, if you would like both *mycompany.com* and *www.mycompany.com* " "to work with your database, having the first redirecting to the second is " @@ -6317,11 +6593,11 @@ msgid "" " redirection. This is commonly called a web redirection." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:383 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:391 msgid "**HTTPS/SSL**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:385 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:393 msgid "" "If the redirection is correctly set up, the platform will automatically " "generate an SSL certificate with `Let's Encrypt " @@ -6329,18 +6605,18 @@ msgid "" "accessible through HTTPS." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:389 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:397 msgid "" "While it is currently not possible to configure your own SSL certificates on" " the Odoo.sh platform we are considering the feature if there is enough " "demand." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:393 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:401 msgid "**SPF and DKIM compliance**" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:395 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:403 msgid "" "In case the domain of your users email addresses use SPF (Sender Policy " "Framework) or DKIM (DomainKeys Identified Mail), don't forget to authorize " @@ -6351,23 +6627,23 @@ msgid "" "<email_communication/dkim_compliant>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:403 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:410 msgid "" "Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host" " can lead to the delivery of your emails as spam in your contacts inbox." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:408 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:414 msgid "Shell commands" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:409 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:416 msgid "" "In the top right-hand corner of the view, different shell commands are " "available." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:414 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:421 msgid "" "Each command can be copied in the clipboard to be used in a terminal, and " "some of them can be used directly from Odoo.sh by clicking the *run* button " @@ -6375,178 +6651,178 @@ msgid "" "placeholders such as ``<URL>``, ``<PATH>``, ..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:420 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:427 msgid "Clone" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:421 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:429 msgid "Download the Git repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:427 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:435 msgid "Clones the repository *odoo/odoo*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:429 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:437 msgid "" ":code:`--recurse-submodules`: Downloads the submodules of your repository. " "Submodules included in the submodules are downloaded as well." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:430 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:438 msgid "" ":code:`--branch`: checks out a specific branch of the repository, in this " "case *master*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:432 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:440 msgid "" "The *run* button is not available for this command, as it is meant to be " "used on your machines." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:435 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:443 msgid "Fork" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:436 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:445 msgid "Create a new branch based on the current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:442 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:451 msgid "" "Creates a new branch called *feature-1* based on the branch *master*, and " "then checkouts it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:448 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:457 msgid "Uploads the new branch *feature-1* on your remote repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:451 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:460 msgid "Merge" msgstr "Samenvoegen" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:452 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:462 msgid "Merge the current branch in another branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:458 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:468 msgid "Merges the branch *staging-1* in the current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:464 -#: ../../content/administration/odoo_sh/getting_started/branches.rst:536 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:474 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:547 msgid "" "Uploads the changes you just added in the *master* branch on your remote " "repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:467 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:477 msgid "SSH" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:469 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:480 msgid "Setup" msgstr "Instellingen" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:470 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:482 msgid "" "In order to use SSH, you have to set up your profile SSH public key (if it " "is not already done). To do so, follow these steps:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:473 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:485 msgid "" "`Generate a new SSH key <https://help.github.com/en/github/authenticating-" "to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-" "agent#generating-a-new-ssh-key>`_" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:475 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:487 msgid "" "`Copy the SSH key to your clipboard " "<https://help.github.com/en/github/authenticating-to-github/adding-a-new-" "ssh-key-to-your-github-account>`_ (only apply the step 1)" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:478 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:490 msgid "Paste the copied content to your profile SSH keys and press \"Add\"" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:483 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:495 msgid "The key should appear below" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:489 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:501 msgid "Connection" msgstr "Connectie" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:491 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:503 msgid "" "To connect to your builds using ssh use the following command in a terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:497 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:509 msgid "" "You will find a shortcut for this command into the SSH tab in the upper " "right corner." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:502 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:514 msgid "" "Provided you have the :ref:`correct access rights <odoosh-gettingstarted-" "settings-collaborators>` on the project, you'll be granted ssh access to the" " build." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:506 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:518 msgid "" "Long running ssh connections are not guaranteed. Idle connections will be " "disconnected in order to free up resources." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:511 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:522 msgid "Submodule" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:513 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:524 msgid "" "Add a branch from another repository in your current branch as a " "*submodule*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:515 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:526 msgid "" "*Submodules* allows you to use modules from other repositories in your " "project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:517 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:528 msgid "" "The submodules feature is detailed in the chapter :ref:`Submodules <odoosh-" "advanced-submodules>` of this documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:524 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:535 msgid "" "Adds the branch *master* of the repository *<URL>* as a submodule under the " "path *<PATH>* in your current branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:530 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:541 msgid "Commits all your current changes." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:541 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:552 msgid "Delete a branch from your repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:547 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:558 msgid "Deletes the branch in your remote repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/branches.rst:553 +#: ../../content/administration/odoo_sh/getting_started/branches.rst:564 msgid "Deletes the branch in your local copy of the repository." msgstr "" @@ -6564,13 +6840,13 @@ msgid "" "this revision." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:19 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:20 msgid "" "In this view, a row represents a branch, and a cell of a row represents a " "build of this branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:21 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:22 msgid "" "Most of the time, builds are created following pushes on your Github " "repository branches. They can be created as well when you do other " @@ -6578,26 +6854,26 @@ msgid "" "a branch in your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:25 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:26 msgid "" "A build is considered successful if no errors or warnings come up during its" " creation. A successful build is highlighted in green." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:28 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:29 msgid "" "A build is considered failed if errors come up during its creation. A failed" " build is highlighted in red." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:31 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:32 msgid "" "If warnings come up during the creation, but there are no errors, the build " "is considered almost successful. It is highlighted in yellow to notify the " "developer warnings were raised." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:34 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:35 msgid "" "Builds do not always create a database from scratch. For instance, when " "pushing a change on the production branch, the build created just starts the" @@ -6606,110 +6882,110 @@ msgid "" "and otherwise failed." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:45 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:46 msgid "" "The first build of a production branch creates a database from scratch. If " "this build is successful, this database is considered as the production " "database of your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:48 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:49 msgid "" "From then, pushes on the production branch will create new builds that " "attempt to load the database using a server running with the new revision." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:51 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:52 msgid "" "If the build is successful, or has warnings but no errors, the production " "database will now run with this build, along with the revision associated to" " this build." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:54 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:55 msgid "" "If the build fails to load or update the database, then the previous " "successful build is re-used to load the database, and therefore the database" " will run using a server running with the previous successful revision." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:57 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:59 msgid "" "The build used to run the production database is always the first of the " "builds list. If a build fails, it is put after the build currently running " "the production database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:63 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:65 msgid "" "Staging builds duplicate the production database, and try to load this " "duplicate with the revisions of the staging branches." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:66 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:68 msgid "" "Each time you push a new revision on a staging branch, the build created " "uses a new copy of the production database. The databases are not re-used " "between builds of the same branch. This ensures:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:69 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:71 msgid "" "staging builds use databases that are close to what the production looks " "like, so you do not make your tests with outdated data," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:72 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:74 msgid "" "you can play around as much as you want in the same staging database, and " "you can then ask for a rebuild when you want to restart with a new copy of " "the production." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:75 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:77 msgid "" "Nevertheless, this means that if you make configuration changes in staging " "databases and do not apply them in the production, they will not be passed " "on the next build of the same staging branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:82 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:83 msgid "" "Development builds create new databases, load the demo data and run the unit" " tests." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:84 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:85 msgid "" "A build will be considered failed and highlighted in red if tests fail " "during the installation, as they are meant to raise errors if something " "wrong occurs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:87 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:88 msgid "" "If all tests pass, and there is no error, the build will be considered " "successful." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:89 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:90 msgid "" "According to the list of modules to install and test, a development build " "can take up to 1 hour to be ready. This is due to the large number of tests " "set in the default Odoo modules suite." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:93 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:94 msgid "Features" msgstr "Functies" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:95 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:96 msgid "" "The production branch will always appear first, and then the other branches " "are ordered by last build created. You can filter out the branches." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:101 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:102 msgid "" "For each branch, you can access the last build's database using the " "*Connect* link and jump to the branch code using the *Github* link. For " @@ -6719,7 +6995,7 @@ msgid "" "branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:109 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:110 msgid "" "For each build, you can access the revision changes using the button with " "the Github icon. You can access the build's database as the administrator " @@ -6728,7 +7004,7 @@ msgid "" "button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/builds.rst:121 +#: ../../content/administration/odoo_sh/getting_started/builds.rst:122 msgid "" "In the dropdown menu of the build, you can access the same features than in " ":ref:`the branches view <odoosh-gettingstarted-branches-tabs>`: *Logs*, *Web" @@ -6760,149 +7036,149 @@ msgid "" " *Create an account* link." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:25 +#: ../../content/administration/odoo_sh/getting_started/create.rst:26 msgid "Authorize Odoo.sh" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:27 +#: ../../content/administration/odoo_sh/getting_started/create.rst:28 msgid "" "Grant Odoo.sh the required accesses to your account by clicking the " "*Authorize* button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:32 +#: ../../content/administration/odoo_sh/getting_started/create.rst:33 msgid "Odoo.sh basically needs:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:34 +#: ../../content/administration/odoo_sh/getting_started/create.rst:35 msgid "to know your Github login and email," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:35 +#: ../../content/administration/odoo_sh/getting_started/create.rst:36 msgid "to create a new repository in case you decide to start from scratch," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:36 +#: ../../content/administration/odoo_sh/getting_started/create.rst:37 msgid "" "to read your existing repositories, including the ones of your " "organizations, in case you want to start from an existing repository," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:37 +#: ../../content/administration/odoo_sh/getting_started/create.rst:39 msgid "to create a webhook to be notified each time you push changes," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:38 +#: ../../content/administration/odoo_sh/getting_started/create.rst:40 msgid "" "to commit changes to make your deployment easier, merging branches or adding" " new `submodules <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ for" " example." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:41 +#: ../../content/administration/odoo_sh/getting_started/create.rst:44 msgid "Submit your project" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:43 +#: ../../content/administration/odoo_sh/getting_started/create.rst:46 msgid "" "Choose if you want to start from scratch by creating a new repository, or if" " you want to use an existing repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:45 +#: ../../content/administration/odoo_sh/getting_started/create.rst:49 msgid "Then, choose a name or select the repository you want to use." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:47 +#: ../../content/administration/odoo_sh/getting_started/create.rst:51 msgid "" "Choose the Odoo version you want to use. If you plan to import an existing " "database or an existing set of applications, you might need to choose the " "according version. If you start from scratch, use the latest version." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:49 +#: ../../content/administration/odoo_sh/getting_started/create.rst:55 msgid "" "Enter your *subscription code*. This is also called *subscription referral*," " *contract number* or *activation code*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:51 +#: ../../content/administration/odoo_sh/getting_started/create.rst:58 msgid "" "It should be the code of your Enterprise subscription that includes Odoo.sh." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:53 +#: ../../content/administration/odoo_sh/getting_started/create.rst:60 msgid "" "Partners can use their partnership codes to start a trial. Should their " "clients start a project, they ought to get an Enterprise subscription " -"including Odoo.sh and use its subscription code. The partner will get the " -"full amount as back commission. Contact your sales representative or account" +"including Odoo.sh and use its subscription code. The partner will get 50% of" +" the amount back as commission. Contact your sales representative or account" " manager in order to get it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:56 +#: ../../content/administration/odoo_sh/getting_started/create.rst:65 msgid "" "When submitting the form, if you are notified your subscription is not " "valid, it either means:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:58 +#: ../../content/administration/odoo_sh/getting_started/create.rst:67 msgid "it is not an existing subscription," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:59 +#: ../../content/administration/odoo_sh/getting_started/create.rst:68 msgid "it is not a partnership subscription," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:60 +#: ../../content/administration/odoo_sh/getting_started/create.rst:69 msgid "it is an enterprise subscription, but which does not include Odoo.sh," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:61 +#: ../../content/administration/odoo_sh/getting_started/create.rst:70 msgid "" "it is neither a partnership subscription or an enterprise subscription (e.g." " an online subscription)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:63 +#: ../../content/administration/odoo_sh/getting_started/create.rst:73 msgid "" "In case of doubt with your subscription, please contact the `Odoo support " "<https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:69 +#: ../../content/administration/odoo_sh/getting_started/create.rst:80 msgid "You're done !" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:71 +#: ../../content/administration/odoo_sh/getting_started/create.rst:82 msgid "" "You can start using Odoo.sh. Your first build is about to be created. You " "will soon be able to connect to your first database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:79 +#: ../../content/administration/odoo_sh/getting_started/create.rst:91 msgid "Import your database" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:81 +#: ../../content/administration/odoo_sh/getting_started/create.rst:93 msgid "" "You can import your database in your Odoo.sh project as long as it is in a " ":doc:`supported version </administration/maintain/supported_versions>` of " "Odoo." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:85 +#: ../../content/administration/odoo_sh/getting_started/create.rst:97 msgid "Push your modules in production" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:87 +#: ../../content/administration/odoo_sh/getting_started/create.rst:99 msgid "" "If you use community or custom modules, add them in a branch in your Github " "repository. Databases hosted on the Odoo.com online platform do not have any" " custom modules. Users of these databases can therefore skip this step." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:91 +#: ../../content/administration/odoo_sh/getting_started/create.rst:103 msgid "" "You can structure your modules as you wish, Odoo.sh will automatically " "detect the folders containing Odoo addons. For instance, you can put all " @@ -6910,86 +7186,86 @@ msgid "" "modules in folders by categories that you define (accounting, project, ...)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:95 +#: ../../content/administration/odoo_sh/getting_started/create.rst:108 msgid "" "For community modules available in public Git repositories, you can also " "consider to add them using :ref:`Submodules <odoosh-advanced-submodules>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:98 +#: ../../content/administration/odoo_sh/getting_started/create.rst:111 msgid "" "Then, either :ref:`make this branch the production branch <odoosh-" "gettingstarted-branches-stages>`, or :ref:`merge it into your production " "branch <odoosh-gettingstarted-branches-mergingbranches>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:102 +#: ../../content/administration/odoo_sh/getting_started/create.rst:115 msgid "Download a backup" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:105 +#: ../../content/administration/odoo_sh/getting_started/create.rst:118 msgid "On-premise databases" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:107 +#: ../../content/administration/odoo_sh/getting_started/create.rst:120 msgid "" "Access the URL :file:`/web/database/manager` of your on-premise database and" " download a backup." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:111 +#: ../../content/administration/odoo_sh/getting_started/create.rst:124 msgid "" "If you cannot access the database manager, it may have been disabled by your" " system administrator. See the :ref:`database manager security documentation" " <db_manager_security>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:114 +#: ../../content/administration/odoo_sh/getting_started/create.rst:127 msgid "" "You will need the master password of your database server. If you do not " "have it, contact your system administrator." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:119 +#: ../../content/administration/odoo_sh/getting_started/create.rst:133 msgid "Choose a zip including the filestore as the backup format." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:125 +#: ../../content/administration/odoo_sh/getting_started/create.rst:139 msgid "Odoo Online databases" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:127 +#: ../../content/administration/odoo_sh/getting_started/create.rst:141 msgid "" "`Access your databases manager " "<https://accounts.odoo.com/my/databases/manage>`_ and download a backup of " "your database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:134 +#: ../../content/administration/odoo_sh/getting_started/create.rst:149 msgid "Online versions (e.g. *saas-**) are not supported on Odoo.sh." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:137 +#: ../../content/administration/odoo_sh/getting_started/create.rst:152 msgid "Upload the backup" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:139 +#: ../../content/administration/odoo_sh/getting_started/create.rst:154 msgid "" "Then, in your Odoo.sh project, in the backups tab of your production branch," " import the backup you just downloaded." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:144 +#: ../../content/administration/odoo_sh/getting_started/create.rst:160 msgid "" "Once the backup imported, you can access the database using the *Connect* " "button in the history of the branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:150 +#: ../../content/administration/odoo_sh/getting_started/create.rst:167 msgid "Check your outgoing email servers" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:152 +#: ../../content/administration/odoo_sh/getting_started/create.rst:169 msgid "" "There is a default mail server provided with Odoo.sh. To use it, there must " "be no enabled outgoing mail server configured in your database in " @@ -6997,27 +7273,27 @@ msgid "" "(:ref:`Developer mode <developer-mode>` must be activated)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:157 +#: ../../content/administration/odoo_sh/getting_started/create.rst:174 msgid "" "After the import of your database, all outgoing email servers are disabled " "so you use the Odoo.sh email server provided by default." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:162 +#: ../../content/administration/odoo_sh/getting_started/create.rst:178 msgid "" "Port 25 is (and will stay) closed. If you want to connect to an external " "SMTP server, you should use ports 465 and 587." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:165 +#: ../../content/administration/odoo_sh/getting_started/create.rst:182 msgid "Check your scheduled actions" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:167 +#: ../../content/administration/odoo_sh/getting_started/create.rst:184 msgid "All scheduled actions are disabled after the import." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:169 +#: ../../content/administration/odoo_sh/getting_started/create.rst:186 msgid "" "This is to prevent your newly imported database to perform actions that " "could impact your running production, such as sending the mails remaining in" @@ -7025,7 +7301,7 @@ msgid "" "synchronization (Calendars, files hosting, ...)." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:173 +#: ../../content/administration/odoo_sh/getting_started/create.rst:190 msgid "" "If you plan to make the imported database your production, enable the " "scheduled actions you need. You can check what is enabled in the database of" @@ -7034,22 +7310,22 @@ msgid "" "Automation --> Scheduled Actions`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:178 +#: ../../content/administration/odoo_sh/getting_started/create.rst:196 msgid "Register your subscription" msgstr "Registreer je abonnement" -#: ../../content/administration/odoo_sh/getting_started/create.rst:180 +#: ../../content/administration/odoo_sh/getting_started/create.rst:198 msgid "Your subscription is unlinked after the import." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:182 +#: ../../content/administration/odoo_sh/getting_started/create.rst:200 msgid "" "The imported database is considered a duplicate by default and the " "enterprise subscription is therefore removed, as you can only have one " "database linked per subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/create.rst:185 +#: ../../content/administration/odoo_sh/getting_started/create.rst:203 msgid "" "If you plan to make it your production, unlink your former database from the" " subscription, and register the newly imported database. Read the " @@ -7139,60 +7415,58 @@ msgstr "" msgid "|pic1| |pic2|" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:40 #: ../../content/administration/odoo_sh/getting_started/first_module.rst:40 msgid "pic1" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:43 #: ../../content/administration/odoo_sh/getting_started/first_module.rst:43 msgid "pic2" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:47 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:46 msgid "" "Once the build created, you can access the editor and browse to the folder " "*~/src/user* to access to the code of your development branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:57 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:56 msgid "From your computer" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:60 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:58 msgid "Clone your Github repository on your computer:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:69 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:67 msgid "Create a new branch:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:77 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:74 msgid "Create the module structure" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:80 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:77 msgid "Scaffolding the module" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:82 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:79 msgid "" "While not necessary, scaffolding avoids the tedium of setting the basic Odoo" " module structure. You can scaffold a new module using the executable *odoo-" "bin*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:85 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:82 msgid "From the Odoo.sh editor, in a terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:91 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:88 msgid "" "Or, from your computer, if you have an :ref:`installation of Odoo " "<setup/install/source>`:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:97 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:94 msgid "" "If you do not want to bother installing Odoo on your computer, you can also " ":download:`download this module structure template " @@ -7200,11 +7474,11 @@ msgid "" "*my_module* to the name of your choice." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:101 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:98 msgid "The below structure will be generated:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:124 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:121 msgid "" "Do not use special characters other than the underscore ( _ ) for your " "module name, not even an hyphen ( - ). This name is used for the Python " @@ -7212,75 +7486,75 @@ msgid "" "other than the underscore is not valid in Python." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:128 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:125 msgid "Uncomment the content of the files:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:130 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:127 msgid "*models/models.py*, an example of model with its fields," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:132 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:129 msgid "" "*views/views.xml*, a tree and a form view, with the menus opening them," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:134 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:131 msgid "*demo/demo.xml*, demo records for the above example model," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:136 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:133 msgid "" "*controllers/controllers.py*, an example of controller implementing some " "routes," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:138 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:135 msgid "" "*views/templates.xml*, two example qweb views used by the above controller " "routes," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:140 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:137 msgid "" "*__manifest__.py*, the manifest of your module, including for instance its " "title, description and data files to load. You just need to uncomment the " "access control list data file:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:149 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:146 msgid "Manually" msgstr "Handmatig" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:151 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:148 msgid "" -"If you want to create your module structure manually, you can follow " -":doc:`Build an Odoo module </developer/howtos/backend>` to understand the " +"If you want to create your module structure manually, you can follow the " +":doc:`/developer/tutorials/getting_started` tutorial to understand the " "structure of a module and the content of each file." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:156 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:153 msgid "Push the development branch" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:158 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:155 msgid "Stage the changes to be committed" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:164 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:399 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:161 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:395 msgid "Commit your changes" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:170 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:167 msgid "Push your changes to your remote repository" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:172 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:169 msgid "From an Odoo.sh editor terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:178 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:175 msgid "" "The above command is explained in the section :ref:`Commit & Push your " "changes <odoosh-gettingstarted-online-editor-push>` of the :ref:`Online " @@ -7289,109 +7563,109 @@ msgid "" "and password, and what to do if you use the two-factor authentication." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:186 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:387 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:413 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:183 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:383 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:409 msgid "Or, from your computer terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:192 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:189 msgid "" "You need to specify *-u origin feature-1* for the first push only. From that" " point, to push your future changes from your computer, you can simply use" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:200 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:197 msgid "Test your module" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:202 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:199 msgid "" "Your branch should appear in your development branches in your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:207 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:204 msgid "" "In the branches view of your project, you can click on your branch name in " "the left navigation panel to access its history." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:213 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:210 msgid "" "You can see here the changes you just pushed, including the comment you set." " Once the database ready, you can access it by clicking the *Connect* " "button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:219 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:216 msgid "" "If your Odoo.sh project is configured to install your module automatically, " "you will directly see it amongst the database apps. Otherwise, it will be " "available in the apps to install." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:223 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:220 msgid "" "You can then play around with your module, create new records and test your " "features and buttons." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:227 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:223 msgid "Test with the production data" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:229 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:225 msgid "" "You need to have a production database for this step. You can create it if " "you do not have it yet." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:231 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:227 msgid "" "Once you tested your module in a development build with the demo data and " "believe it is ready, you can test it with the production data using a " "staging branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:234 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:230 msgid "You can either:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:236 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:232 msgid "" "Make your development branch a staging branch, by drag and dropping it onto " "the *staging* section title." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:242 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:238 msgid "" "Merge it in an existing staging branch, by drag and dropping it onto the " "given staging branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:247 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:293 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:243 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:289 msgid "You can also use the :code:`git merge` command to merge your branches." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:249 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:245 msgid "" "This will create a new staging build, which will duplicate the production " "database and make it run using a server updated with your latest changes of " "your branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:255 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:301 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:251 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:297 msgid "Once the database ready, you can access it using the *Connect* button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:260 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:304 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:256 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:300 msgid "Install your module" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:262 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:258 msgid "" "Your module will not be installed automatically, you have to install it from" " the apps menu. Indeed, the purpose of the staging build is to test the " @@ -7400,50 +7674,50 @@ msgid "" " on demand." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:267 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:263 msgid "" "Your module may not appear directly in your apps to install either, you need" " to update your apps list first:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:270 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:266 msgid "Activate the :ref:`developer mode <developer-mode>`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:271 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:267 msgid "in the apps menu, click the *Update Apps List* button," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:272 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:268 msgid "in the dialog that appears, click the *Update* button." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:277 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:273 msgid "Your module will then appear in the list of available apps." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:283 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:279 msgid "Deploy in production" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:285 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:281 msgid "" "Once you tested your module in a staging branch with your production data, " "and believe it is ready for production, you can merge your branch in the " "production branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:288 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:284 msgid "Drag and drop your staging branch on the production branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:295 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:291 msgid "" "This will merge the latest changes of your staging branch in the production " "branch, and update your production server with these latest changes." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:306 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:302 msgid "" "Your module will not be installed automatically, you have to install it " "manually as explained in the :ref:`above section about installing your " @@ -7451,127 +7725,127 @@ msgid "" "productiondata-install>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:312 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:308 msgid "Add a change" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:314 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:310 msgid "" "This section explains how to add a change in your module by adding a new " "field in a model and deploy it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:319 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:315 msgid "From the Odoo.sh editor," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:318 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:314 msgid "browse to your module folder *~/src/user/my_module*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:319 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:315 msgid "then, open the file *models/models.py*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:325 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:321 msgid "Or, from your computer," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:322 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:318 msgid "" "use the file browser of your choice to browse to your module folder " "*~/src/odoo-addons/my_module*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:324 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:320 msgid "" "then, open the file *models/models.py* using the editor of your choice, such" " as *Atom*, *Sublime Text*, *PyCharm*, *vim*, ..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:327 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:323 msgid "Then, after the description field" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:333 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:329 msgid "Add a datetime field" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:339 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:335 msgid "Then, open the file *views/views.xml*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:341 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:477 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:337 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:473 msgid "After" msgstr "Na" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:347 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:454 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:471 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:483 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:343 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:450 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:467 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:479 msgid "Add" msgstr "Toevoegen" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:353 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:349 msgid "" "These changes alter the database structure by adding a column in a table, " "and modify a view stored in database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:356 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:352 msgid "" "In order to be applied in existing databases, such as your production " "database, these changes requires the module to be updated." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:359 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:355 msgid "" "If you would like the update to be performed automatically by the Odoo.sh " "platform when you push your changes, increase your module version in its " "manifest." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:362 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:358 msgid "Open the module manifest *__manifest__.py*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:370 -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:508 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:366 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:504 msgid "with" msgstr "met" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:376 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:372 msgid "" "The platform will detect the change of version and trigger the update of the" " module upon the new revision deployment." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:379 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:375 msgid "Browse to your Git folder." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:381 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:377 msgid "Then, from an Odoo.sh terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:393 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:389 msgid "Then, stage your changes to be committed" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:405 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:401 msgid "Push your changes:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:407 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:403 msgid "From an Odoo.sh terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:419 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:415 msgid "The platform will then create a new build for the branch *feature-1*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:424 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:420 msgid "" "Once you tested your changes, you can merge your changes in the production " "branch, for instance by drag-and-dropping the branch on the production " @@ -7581,18 +7855,18 @@ msgid "" "module within the apps list." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:430 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:426 msgid "Use an external Python library" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:432 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:428 msgid "" "If you would like to use an external Python library which is not installed " "by default, you can define a *requirements.txt* file listing the external " "libraries your modules depends on." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:436 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:432 msgid "" "It is not possible to install or upgrade system packages on an Odoo.sh " "database (e.g., apt packages). However, under specific conditions, packages " @@ -7601,81 +7875,81 @@ msgid "" "modules**." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:440 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:436 msgid "**PostgreSQL extensions** are not supported on Odoo.sh." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:441 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:437 msgid "" "For more information, consult our `FAQ " "<https://www.odoo.sh/faq#install_dependencies>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:443 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:439 msgid "" "The platform will use this file to automatically install the Python " "libraries your project needs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:445 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:441 msgid "" "The feature is explained in this section by using the `Unidecode library " "<https://pypi.python.org/pypi/Unidecode>`_ in your module." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:448 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:444 msgid "Create a file *requirements.txt* in the root folder of your repository" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:450 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:446 msgid "" "From the Odoo.sh editor, create and open the file " "~/src/user/requirements.txt." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:452 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:448 msgid "" "Or, from your computer, create and open the file ~/src/odoo-" "addons/requirements.txt." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:460 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:456 msgid "" "Then use the library in your module, for instance to remove accents from " "characters in the name field of your model." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:463 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:459 msgid "Open the file *models/models.py*." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:465 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:461 msgid "Before" msgstr "Eerder" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:498 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:494 msgid "" "Adding a Python dependency requires a module version increase for the " "platform to install it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:500 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:496 msgid "Edit the module manifest *__manifest__.py*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:514 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:510 msgid "Stage and commit your changes:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:522 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:518 msgid "Then, push your changes:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:524 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:520 msgid "In an Odoo.sh terminal:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/first_module.rst:530 +#: ../../content/administration/odoo_sh/getting_started/first_module.rst:526 msgid "In your computer terminal:" msgstr "" @@ -7850,7 +8124,7 @@ msgid "" "suffices." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:138 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:137 msgid "" "The Git source folder *~/src/user* is not checked out on a branch but rather" " on a detached revision: This is because builds work on specific revisions " @@ -7858,7 +8132,7 @@ msgid "" "builds on the same branch, but on different revisions." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:142 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:141 msgid "" "Once your changes are pushed, according to your :ref:`branch push behavior " "<odoosh-gettingstarted-branches-tabs-settings>`, a new build may be created." @@ -7867,11 +8141,11 @@ msgid "" " in an editor of a build using the latest revision of your branch." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:149 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:148 msgid "Consoles" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:151 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:150 msgid "" "You can open Python consoles, which are `IPython interactive shells " "<https://ipython.readthedocs.io/en/stable/interactive/tutorial.html>`_. One " @@ -7882,20 +8156,20 @@ msgid "" " in HTML." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:159 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:158 msgid "" "You can for instance display cells of a CSV file using `pandas " "<https://pandas.pydata.org/pandas-docs/stable/tutorials.html>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:165 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:164 msgid "" "You can also open an Odoo Shell console to play around with the Odoo " "registry and model methods of your database. You can also directly read or " "write on your records." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:170 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:169 msgid "" "In an Odoo Console, transactions are automatically committed. This means, " "for instance, that changes in records are applied effectively in the " @@ -7904,13 +8178,13 @@ msgid "" "on production databases." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:176 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:174 msgid "" "You can use *env* to invoke models of your database registry, e.g. " ":code:`env['res.users']`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:186 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:184 msgid "" "The class :code:`Pretty` gives you the possibility to easily display lists " "and dicts in a pretty way, using the `rich display " @@ -7918,60 +8192,60 @@ msgid "" "display>`_ mentioned above." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:194 +#: ../../content/administration/odoo_sh/getting_started/online-editor.rst:192 msgid "" "You can also use `pandas <https://pandas.pydata.org/pandas-" "docs/stable/tutorials.html>`_ to display graphs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:9 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:8 msgid "The settings allow you to manage the configuration of your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:15 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:14 msgid "Project name" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:17 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:16 msgid "The name of your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:22 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:21 msgid "" "This defines the address that will be used to access your production " "database." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:24 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:23 msgid "" "Addresses of your staging and development builds are derived from this name " "and assigned automatically. However, when you change your project name, only" " future builds will use the new name." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:30 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:29 msgid "Collaborators" msgstr "Medewerkers" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:32 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:31 msgid "Manage the Github users who can access your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:37 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:36 msgid "There are two levels of users:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:39 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:38 msgid "Admin: has access to all features of Odoo.sh." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:40 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:39 msgid "" "User: does not have access to the project settings nor to the production and" " staging databases." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:42 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:41 msgid "" "The user group is meant for developers who can make modifications in your " "code but are not allowed to access the production data. Users of this group " @@ -7980,110 +8254,90 @@ msgid "" "databases if they have one, using their regular credentials." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:47 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:46 msgid "" "In addition, they cannot use the webshell nor have access to the server " "logs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:50 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "Gebruiker" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:50 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "Beheerder" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:52 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:52 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:60 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:60 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:64 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:64 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:68 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:72 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:76 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:80 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:80 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:64 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:80 -#: ../../content/administration/odoo_sh/getting_started/status.rst:4 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 +#: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "Status" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:88 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -8091,7 +8345,7 @@ msgid "" "documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -8099,106 +8353,106 @@ msgid "" "revisions of this private repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:135 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:137 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:139 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:141 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:149 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:154 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:156 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:158 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:161 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "<https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:163 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:167 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " "more, it will automatically be synchronized with your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:177 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -8207,38 +8461,38 @@ msgid "" "<https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " "your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "Activatie" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/status.rst:9 +#: ../../content/administration/odoo_sh/getting_started/status.rst:8 msgid "" "The status page shows statistics regarding the servers your project uses. It" " includes the servers availability." msgstr "" -#: ../../content/administration/odoo_sh/overview/introduction.rst:4 +#: ../../content/administration/odoo_sh/overview/introduction.rst:3 msgid "Introduction to Odoo.sh" msgstr "" -#: ../../content/administration/odoo_sh/overview/introduction.rst:11 +#: ../../content/administration/odoo_sh/overview/introduction.rst:10 msgid "" "The documentation will help you go live with your Odoo.sh project in no " "time." @@ -8272,7 +8526,7 @@ msgstr "" #: ../../content/administration/upgrade.rst:29 #: ../../content/administration/upgrade.rst:148 -#: ../../content/administration/upgrade.rst:252 +#: ../../content/administration/upgrade.rst:259 #: ../../content/administration/upgrade/faq.rst:81 #: ../../content/administration/upgrade/faq.rst:92 #: ../../content/administration/upgrade/faq.rst:119 @@ -8445,7 +8699,7 @@ msgid "" "<https://upgrade.odoo.com>`_ and select *Testing* purpose." msgstr "" -#: ../../content/administration/upgrade.rstNone +#: ../../content/administration/upgrade.rst-1 msgid "Selection of the \"Testing\" purpose in the upgrade form on Odoo" msgstr "" @@ -8584,7 +8838,7 @@ msgid "Help" msgstr "Help" #: ../../content/administration/upgrade.rst:200 -msgid "Contact our Upgrade service support" +msgid "Contact our upgrade service support" msgstr "" #: ../../content/administration/upgrade.rst:202 @@ -8608,80 +8862,101 @@ msgid "" msgstr "" #: ../../content/administration/upgrade.rst:218 -#: ../../content/administration/upgrade.rst:257 msgid ":doc:`maintain/supported_versions`" msgstr "" #: ../../content/administration/upgrade.rst:223 -msgid "Service Level Agreement" +msgid "Service-level agreement (SLA)" msgstr "" -#: ../../content/administration/upgrade.rst:226 -msgid "What is covered by the Enterprise Licence?" +#: ../../content/administration/upgrade.rst:225 +msgid "" +"With Odoo Enterprise, upgrading a database to the most recent version of " +"Odoo is **free**, including any support required to rectify potential " +"discrepancies in the upgraded database." msgstr "" #: ../../content/administration/upgrade.rst:228 msgid "" -"Databases hosted on Odoo’s Cloud platforms (Odoo Online and Odoo.sh) or On-" -"Premise (Self-Hosting) enjoy the following services at all times." -msgstr "" - -#: ../../content/administration/upgrade.rst:231 -msgid "The upgrade of:" +"Information about the upgrade services included in the Enterprise Licence is" +" available in the :ref:`Odoo Enterprise Subscription Agreement <upgrade>`. " +"However, this section clarifies what upgrade services you can expect." msgstr "" #: ../../content/administration/upgrade.rst:233 -msgid "standard applications" -msgstr "" - -#: ../../content/administration/upgrade.rst:234 -msgid "" -"Studio customization (as long as the :guilabel:`Studio` app is still active)" +msgid "Upgrade services covered by the SLA" msgstr "" #: ../../content/administration/upgrade.rst:235 msgid "" -"customizations done by our consulting and developer services *if* they are " -"covered by a ‘Maintenance of Customisations’ subscription" +"Databases hosted on Odoo's cloud platforms (Odoo Online and Odoo.sh) or " +"self-hosted (On-Premise) can benefit from upgrade services at all times for:" msgstr "" #: ../../content/administration/upgrade.rst:238 -msgid "" -"The Upgrade Service is limited to your database's technical conversion and " -"adaptation (standard modules and data) to make it compatible with the " -"targeted version." +msgid "the upgrade of all **standard applications**;" msgstr "" -#: ../../content/administration/upgrade.rst:242 -msgid "What upgrading does NOT cover" +#: ../../content/administration/upgrade.rst:239 +msgid "" +"the upgrade of all **customizations created with the Studio app**, as long " +"as Studio is still installed and the respective subscription is still " +"active; and" +msgstr "" + +#: ../../content/administration/upgrade.rst:241 +msgid "" +"the upgrade of all **developments and customizations covered by a " +"maintenance of customizations subscription**." msgstr "" #: ../../content/administration/upgrade.rst:244 -msgid "The cleaning of pre-existing data & configuration while upgrading" -msgstr "" - -#: ../../content/administration/upgrade.rst:245 msgid "" -"Any new developments and/or upgrades of your own :ref:`custom modules " -"<upgrade-faq/custom-modules>`" +"Upgrade services are limited to the technical conversion and adaptation of a" +" database (standard modules and data) to make it compatible with the version" +" targeted by the upgrade." msgstr "" -#: ../../content/administration/upgrade.rst:247 -msgid "`Training <https://www.odoo.com/learn>`_ on the latest version" +#: ../../content/administration/upgrade.rst:248 +msgid "Upgrade services not covered by the SLA" msgstr "" -#: ../../content/administration/upgrade.rst:249 +#: ../../content/administration/upgrade.rst:250 +msgid "The following upgrade-related services are **not** included:" +msgstr "" + +#: ../../content/administration/upgrade.rst:252 msgid "" -"You can get more information about your Enterprise Licence on our :ref:`Odoo" -" Enterprise Subscription Agreement <upgrade>` page." +"the **cleaning** of pre-existing data and configurations while upgrading;" msgstr "" -#: ../../content/administration/upgrade.rst:255 -msgid ":doc:`upgrade/faq`" +#: ../../content/administration/upgrade.rst:253 +msgid "" +"the upgrade of **custom modules created in-house or by third parties**, " +"including Odoo partners;" msgstr "" -#: ../../content/administration/upgrade.rst:256 -msgid ":doc:`odoo_sh`" +#: ../../content/administration/upgrade.rst:254 +msgid "" +"lines of **code added to standard modules**, i.e., customizations created " +"outside the Studio app, code entered manually, and :ref:`automated actions " +"using Python code <studio/automated-actions/action>`; and" +msgstr "" + +#: ../../content/administration/upgrade.rst:257 +msgid "**training** on using the upgraded version's features and workflows." +msgstr "" + +#: ../../content/administration/upgrade.rst:262 +msgid ":doc:`Upgrade FAQ <upgrade/faq>`" +msgstr "" + +#: ../../content/administration/upgrade.rst:263 +msgid ":doc:`Odoo.sh documentation <odoo_sh>`" +msgstr "" + +#: ../../content/administration/upgrade.rst:264 +msgid ":doc:`Supported Odoo versions <maintain/supported_versions>`" msgstr "" #: ../../content/administration/upgrade/faq.rst:8 @@ -9124,7 +9399,7 @@ msgid "" "available for valid projects with a valid production build." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rstNone +#: ../../content/administration/upgrade/odoo_sh.rst-1 msgid "Click on the upgrade menu" msgstr "" @@ -9199,7 +9474,7 @@ msgid "" " Then, click on :guilabel:`Test Upgrade`." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rstNone +#: ../../content/administration/upgrade/odoo_sh.rst-1 msgid "Odoo.sh project and tabs" msgstr "" @@ -9276,7 +9551,7 @@ msgid "" "Upgrade` button." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rstNone +#: ../../content/administration/upgrade/odoo_sh.rst-1 msgid "View from the upgrade tab" msgstr "" @@ -9293,7 +9568,7 @@ msgid "" "tab of the main branch." msgstr "" -#: ../../content/administration/upgrade/odoo_sh.rstNone +#: ../../content/administration/upgrade/odoo_sh.rst-1 msgid "View showing the progress of the upgrade" msgstr "" diff --git a/locale/nl/LC_MESSAGES/finance.po b/locale/nl/LC_MESSAGES/finance.po index fd930aac0..8640b2254 100644 --- a/locale/nl/LC_MESSAGES/finance.po +++ b/locale/nl/LC_MESSAGES/finance.po @@ -11,20 +11,20 @@ # Cas Vissers <casvissers@brahoo.nl>, 2022 # Gunther Clauwaert <gclauwae@hotmail.com>, 2022 # Guido Leenders, 2023 -# Yenthe Van Ginneken <yenthespam@gmail.com>, 2023 # Dylan Kiss, 2023 # Jolien De Paepe, 2023 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2023 # Martin Trigaux, 2023 +# Yenthe Van Ginneken <yenthespam@gmail.com>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" +"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2023\n" "Language-Team: Dutch (https://app.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -547,10 +547,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -574,7 +574,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3955,6 +3955,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Leveringscondities" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5800,6 +5891,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7298,10 +7390,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7313,101 +7404,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Betalingsherinneringen" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Betalingsherinneringen" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7419,11 +7542,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7431,15 +7554,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9595,19 +9718,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9617,23 +9732,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9641,7 +9744,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9653,21 +9756,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "Product configuratie" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Goederencode" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9675,24 +9778,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9700,7 +9803,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9709,39 +9812,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9752,96 +9855,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9851,73 +9931,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10286,7 +10366,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11439,7 +11519,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11614,52 +11694,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11667,46 +11728,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Rapportages" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12216,70 +12291,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12310,7 +12385,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Handmatig" @@ -13676,330 +13750,919 @@ msgstr "Declaraties" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Boekhouding: boekhouder of adviseur" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Declaraties: Manage" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "Uitleg:" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Boekhouding: boekhouder of adviseur" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Declaraties: Manage" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "Uitgaven herfactureren naar klanten" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Instellingen" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15608,10 +16271,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Rapportages" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24458,7 +25117,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24758,7 +25417,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29282,7 +29941,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29505,14 +30163,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29520,7 +30178,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29594,26 +30252,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29625,7 +30293,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29635,7 +30303,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29646,36 +30314,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Adyen-account" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29687,26 +30399,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29716,21 +30428,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30533,7 +31245,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "Instellingen in Odo" @@ -30547,183 +31259,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30731,7 +31391,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30739,44 +31399,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Inloggegevens" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" "Voer een testtransactie uit vanuit Odoo met de persoonlijke sandbox account." diff --git a/locale/nl/LC_MESSAGES/inventory_and_mrp.po b/locale/nl/LC_MESSAGES/inventory_and_mrp.po index 4a3d96471..d05d1b4d0 100644 --- a/locale/nl/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/nl/LC_MESSAGES/inventory_and_mrp.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Jolien De Paepe, 2023\n" "Language-Team: Dutch (https://app.transifex.com/odoo/teams/41243/nl/)\n" @@ -4750,8 +4750,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4788,7 +4788,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4800,8 +4800,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4809,7 +4809,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4886,16 +4886,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4923,8 +4922,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4965,9 +4964,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index 6377d7aca..e3337f567 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -10,17 +10,17 @@ # Gunther Clauwaert <gclauwae@hotmail.com>, 2022 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2022 # Jolien De Paepe, 2023 -# Martin Trigaux, 2023 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Dutch (https://app.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,6 +86,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1658,8 +1659,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1668,9 +1670,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1697,41 +1699,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "Registreer klanten" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "Vanuit uw sessie interface gebruikt u de klanten knop." - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "Maak een nieuwe door deze knop te gebruiken." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "U wordt gevraagd om de klant zijn informatie in te vullen." - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1739,14 +1731,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1757,7 +1749,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1768,37 +1760,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1808,13 +1800,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1822,27 +1814,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1856,31 +1848,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2435,93 +2427,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "Wissel van kassier zonder pincode" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analyses" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3888,21 +3897,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Facturen" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3914,7 +3923,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3922,23 +3931,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3949,27 +3958,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3979,23 +3988,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -4009,7 +4018,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4643,8 +4652,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/nl/LC_MESSAGES/websites.po b/locale/nl/LC_MESSAGES/websites.po index 6219e29ec..f098554bd 100644 --- a/locale/nl/LC_MESSAGES/websites.po +++ b/locale/nl/LC_MESSAGES/websites.po @@ -5,7 +5,6 @@ # # Translators: # Maxim Vandenbroucke <mxv@odoo.com>, 2022 -# Cas Vissers <casvissers@brahoo.nl>, 2022 # Gunther Clauwaert <gclauwae@hotmail.com>, 2022 # Jolien De Paepe, 2023 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2023 @@ -17,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-13 05:55+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Dutch (https://app.transifex.com/odoo/teams/41243/nl/)\n" @@ -488,8 +487,9 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 msgid "Configuration" msgstr "Configuratie" @@ -686,7 +686,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1182,6 +1182,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analyses" @@ -1218,7 +1219,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Producten" @@ -1715,24 +1715,23 @@ msgid "" "To add a tax on a product, you can either set a tax in the " ":guilabel:`Customer Taxes` field of the **product template** or use " ":doc:`fiscal positions " -"</applications/finance/accounting/taxation/taxes/fiscal_positions>`." +"</applications/finance/accounting/taxes/fiscal_positions>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxes`" +msgid ":doc:`/applications/finance/accounting/taxes`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/avatax`" +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxcloud`" +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 -msgid "" -":doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`" +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 @@ -1782,7 +1781,7 @@ msgid "Tax type displayed on the product page" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/B2B_B2C`" +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 @@ -1826,11 +1825,11 @@ msgid "" msgstr "" ":doc:`/applicaties/inventaris_and_mrp/inventaris/beheer/producten/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1841,12 +1840,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1854,15 +1853,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1870,11 +1869,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1886,15 +1885,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1906,7 +1905,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2844,439 +2843,424 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 +msgid "" +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 +msgid "" +"Essential cookies, which are necessary for the website to function properly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 +msgid "" +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 +msgid "" +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR <https://gdpr.eu>`_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 +msgid "" +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 +msgid "" +"You can :ref:`customize the appearance of your cookies bar <cookies-" +"bar/customization>` and :ref:`edit the content of the related Cookie Policy " +"page <cookies-bar/policy>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 +msgid "" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 +msgid "" +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 +msgid "" +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 +msgid "" +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 +msgid "" +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 +msgid "" +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 +msgid "" +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 +msgid "" +"You could add a link providing access to this page, in your website's " +"footer, for example." +msgstr "" + #: ../../content/applications/websites/website/configuration/multi_website.rst:3 msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Instellingen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Opties toevoegen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "etc." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Prijzen" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Rapportages" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forums" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Evenementen" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Functies" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multi-bedrijven" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Prijslijsten" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4766,10 +4750,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Rapportages" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "Hoe het verkeer op uw website traceren in Google Analytics" diff --git a/locale/pt_BR/LC_MESSAGES/administration.po b/locale/pt_BR/LC_MESSAGES/administration.po index de7ab4318..c27ab42fc 100644 --- a/locale/pt_BR/LC_MESSAGES/administration.po +++ b/locale/pt_BR/LC_MESSAGES/administration.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" @@ -1350,7 +1350,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "Odoo Online" @@ -2783,7 +2783,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -4294,6 +4294,8 @@ msgstr "" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Atualização" @@ -4849,278 +4851,346 @@ msgstr "Esta matriz mostra o status de suporte de cada versão." msgid "**Major releases are in bold type.**" msgstr "** Os principais lançamentos estão em negrito. **" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "No local" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "Data de lançamento" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "|green|" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "Nenhum" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "|red|" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "**Odoo 14.0**" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "Outubro de 2020" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "**Odoo 13.0**" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "Outubro de 2019" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "Agosto de 2019" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "**Odoo 12.0**" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "Outubro de 2018" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "Abril de 2018" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "**Odoo 11.0**" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "Outubro de 2017" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "Odoo 10.saas~15" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "Março de 2017" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "Odoo 10.saas~14" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "Janeiro de 2017" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "**Odoo 10.0**" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "Outubro de 2016" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "Odoo 9.saas~11" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "Maio de 2016" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "**Odoo 9.0**" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "Outubro de 2015" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "Odoo 8.saas~6" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "Fevereiro de 2015" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "**Odoo 8.0**" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "Setembro de 2014" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "|green| Versão suportada" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "|red| Fim do suporte" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "N/D Nunca lançado para esta plataforma" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "🏁 Versão futura, ainda não lançada" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "Eu executo uma versão mais antiga de Odoo/OpenERP/TinyERP" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" "OpenERP 7.0, 6.1, 6.0 e 5.0 não é mais suportado, em qualquer plataforma." -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" "TinyERP 4.0, 3.0, 2.0 e 1.0 não é mais suportado, em qualquer plataforma." -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version <https://upgrade.odoo.com/>`_." @@ -5700,7 +5770,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "" @@ -6018,7 +6088,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "Desenvolvimento" @@ -6145,8 +6215,8 @@ msgid "Tabs" msgstr "Abas" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "Histórico" @@ -6174,8 +6244,8 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "E-mails" @@ -6222,7 +6292,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "" @@ -6238,8 +6308,8 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "Logs" @@ -6290,7 +6360,7 @@ msgid "" msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "" @@ -6387,9 +6457,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "Definições" @@ -8244,95 +8314,84 @@ msgid "" "logs." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "Usuário" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "Situação" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -8340,7 +8399,7 @@ msgid "" "documentation." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -8348,106 +8407,106 @@ msgid "" "revisions of this private repository." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "<https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " "more, it will automatically be synchronized with your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -8456,22 +8515,22 @@ msgid "" "<https://www.odoo.com/help>`_." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " "your subscription." msgstr "" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "Ativação" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/pt_BR/LC_MESSAGES/finance.po b/locale/pt_BR/LC_MESSAGES/finance.po index fa07d051b..7c2a7fc2b 100644 --- a/locale/pt_BR/LC_MESSAGES/finance.po +++ b/locale/pt_BR/LC_MESSAGES/finance.po @@ -10,22 +10,22 @@ # Mateus Lopes <mateus1@gmail.com>, 2023 # grazziano <gra.negocia@gmail.com>, 2023 # Luis Gustavo Almeida <luis.gustavo@kmee.com.br>, 2023 -# Luis Felipe Miléo <mileo@kmee.com.br>, 2023 # Marcos Rodrigues, 2023 # Éder Brito <britoederr@gmail.com>, 2023 -# Martin Trigaux, 2023 # Kevilyn Rosa, 2023 # Layna Nascimento, 2023 +# Martin Trigaux, 2023 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2023 +# Luis Felipe Miléo <mileo@kmee.com.br>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>, 2023\n" +"Last-Translator: Luis Felipe Miléo <mileo@kmee.com.br>, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -555,10 +555,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -582,7 +582,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4106,6 +4106,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterms" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -6023,6 +6114,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7587,10 +7679,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7602,101 +7693,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Relatórios de acompanhamento" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Relatórios de acompanhamento" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7708,11 +7831,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7720,15 +7843,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr ":doc:`.../.../.../general/in_app_purchase`" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9930,19 +10053,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9952,23 +10067,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9976,7 +10079,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9988,21 +10091,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "Configuração do produto" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -10010,24 +10113,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -10035,7 +10138,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -10044,39 +10147,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -10087,96 +10190,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -10186,73 +10266,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10593,7 +10673,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11779,7 +11859,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr ":doc:`fiscal_positions`" @@ -11954,52 +12034,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -12007,46 +12068,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Relatórios" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12583,70 +12658,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12677,7 +12752,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manualmente" @@ -14043,403 +14117,920 @@ msgstr "Despesas" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "Como definir os tipos de despesas" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"A primeira etapa para rastrear despesas é configurar os tipos de despesas " -"(gerenciadas como produtos no Odoo) que sua empresa permite, a partir do " -"menu * Configuração *. Quando uma despesa específica é reembolsada a um " -"preço fixo, defina um custo para o produto. Caso contrário, mantenha o custo" -" em 0,0 e os funcionários reportarão o custo real por despesa." -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "Restaurante:" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" -"Custo: 0,00 (o custo da passagem será registrado em todas as despesas)" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "Viagem com carro pessoal:" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" -msgstr "Custo: 0,30 (o preço por milha reembolsado pela empresa é fixo)" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "Hotel:" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "Outros:" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "Custo: 0.0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "Como registrar despesas" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -"Como funcionário (Funcionário com direitos de acesso do usuário), você pode " -"registrar despesas em: seleção de menus: `Minhas despesas -> Despesas a " -"enviar`." -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" -"Selecione o produto relacionado e insira o valor total que você pagou (com " -"Quantidade = 1) ou o preço unitário se a Quantidade for contável (por " -"exemplo, número de noites de hotel)." #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "Insira a data da despesa." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -"Escolha se você pagou a conta por conta própria (e espera ser reembolsado) " -"ou se a empresa pagou diretamente (por exemplo, se você usou o cartão de " -"crédito de uma empresa)." -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" -"Defina a referência da fatura, adicione algumas notas se solicitado e anexe " -"uma foto / digitalização do recibo do tópico de discussão. Isso ajudará o " -"gerente e o contador a validá-lo." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "Em um clique de emails" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "" -"Deixe seus funcionários registrarem suas despesas a partir de um simples " -"e-mail. Faça um instantâneo do recibo e envie por e-mail, ou simplesmente " -"encaminhe uma fatura!" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"A única coisa a fazer é configurar um pseudônimo de e-mail em: seleção de " -"menus: ʻDespesas-> Configuração -> Configurações` (por exemplo, * despesas *" -" @ minhaempresa.odoo.com). Por motivos de segurança, apenas e-mails de " -"funcionários autenticados (cfr. * Email de trabalho * no formulário de " -"detalhes do funcionário) são aceitos." -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "Como enviar gastos para os gerentes" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -"Você também pode enviar despesas uma a uma usando o botão * Enviar ao " -"gerente * na tela de formulário de uma despesa." -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -"Todos os seus relatórios de despesas enviados podem ser encontrados em: menu" -" de seleção: `Despesas -> Minhas despesas -> Relatórios de despesas`." -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "Como aprovar gastos" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"Os gerentes de RH e de equipe obtêm uma visão geral de todos os relatórios " -"de despesas para validar no menu superior: seleção de menus: `Para aprovar " -"-> Relatórios de despesas para aprovar`. Esses usuários devem ter pelo menos" -" direitos de acesso de * Diretores * para * Despesas *." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -"Eles podem revisar relatórios de despesas, aprová-los ou rejeitá-los, além " -"de fornecer feedback graças à ferramenta de comunicação integrada." -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -"Como gerente de equipe, você pode encontrar facilmente os relatórios de " -"despesas dos membros de sua equipe. Você precisa ser definido como gerente " -"na forma de detalhes desses funcionários." -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "Como lançar despesas na contabilidade" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"Assim que os relatórios de despesas são aprovados pelos gerentes, o " -"departamento de contabilidade vai para: seleção de menus: `Despesas -> " -"Contador -> Relatórios de despesas para lançar` para verificar contas, " -"produtos e impostos. Eles podem clicar em * Publicar entradas de diário * " -"para publicar entradas de diário relacionadas em seus livros. Para fazer " -"isso, o usuário deve ter os seguintes direitos de acesso:" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Contabilidade: Contador ou Consultor" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Despesas: Gerente" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"Para lançar uma despesa, um * Endereço residencial * deve ser definido no " -"funcionário. Se você receber uma mensagem de bloqueio relacionada ao postar," -" clique no funcionário, vá para a guia * Informações pessoais * e selecione " -"/ crie o contato do seu funcionário no catálogo de endereços. Um contato foi" -" criado automaticamente se esta pessoa estiver usando Odoo." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "Como reembolsar os colaboradores" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"Agora você pode ver todos os relatórios de despesas a reembolsar em: seleção" -" de menus: `Despesas -> Contador -> Relatórios de despesas a pagar`. Para " -"registrar o pagamento ou pagar em cheque, clique em * Registrar um pagamento" -" *." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "" -"Veja como você pode gerenciar facilmente o processo de pagamento no Odoo:" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "Como fazer refaturamento para os seus consumidores" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -"Se você rastrear despesas em projetos de clientes, poderá cobrá-las " -"automaticamente." -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "Explicação:" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Contabilidade: Contador ou Consultor" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Despesas: Gerente" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "Refaturar despesas aos clientes" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Definição" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "Habilite ** Faturamento do cliente ** nas configurações de despesas" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" -msgstr "" -"Vá para o menu de configuração do produto e defina o método de faturamento " -"em todos os seus tipos de despesas:" - -#: ../../content/applications/finance/expenses.rst:184 -msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 -msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." -msgstr "A custo: faturará as despesas ao seu custo real." - -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -"A preço de venda: irá faturar com base em um preço de venda fixo definido no" -" pedido de venda." -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "Criar um pedido" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -"Como um vendedor, crie e confirme a ordem de venda pelos serviços entregues " -"ao cliente. Se você não colocar nenhuma despesa na ordem, ela será " -"adicionada automaticamente assim que postada pelo contador." -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "Vincula a despesa ao Pedido de Vendas." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "Envia, valida e lança a despesa" +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -"Como gerente, certifique-se de que a conta analítica seja definida em cada " -"linha de despesas ao aprovar relatórios de despesas. Clique na linha para " -"adicionar um se estiver faltando. Os funcionários já podem definir um ao " -"enviar." -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "Como contador, faça lançamentos contábeis manuais." +#: ../../content/applications/finance/expenses.rst:478 +msgid "" +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:483 +msgid "" +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "Fatura de despesas" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"Agora você pode faturar o pedido. Ele aparece em: seleção de menus: `Vendas " -"-> Faturamento -> Vendas` para fatura . As despesas foram adicionadas " -"automaticamente nas linhas do pedido. Esses itens aparecem em azul (ou seja," -" na fatura)." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "e (ou seja, para faturar)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -16047,10 +16638,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Relatórios" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -25071,7 +25658,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -25371,7 +25958,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29940,7 +30527,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "Guia de credenciais" @@ -30163,14 +30749,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -30178,7 +30764,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -30252,26 +30838,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -30283,7 +30879,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -30293,7 +30889,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -30304,36 +30900,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Conta Adyen" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -30345,26 +30985,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "Colocar um cartão em espera" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -30374,21 +31014,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -31191,7 +31831,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "Configurações no Odoo" @@ -31205,183 +31845,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." -msgstr "" +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" +msgstr "Retorno Automático" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" -msgstr "" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" +msgstr "Notificação Instantânea de Pagamento (IPN)" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "Configurações no Paypal" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "Conta Paypal Opcional" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "Formato de Mensagens de Pagamento" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 +#: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "Sua conta Paypal está pronta!" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -31389,7 +31977,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -31397,44 +31985,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" -msgstr "Ambiente de teste" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Credenciais" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:98 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "Ambiente de teste" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" @@ -32459,7 +33123,7 @@ msgstr "" #: ../../content/applications/finance/spreadsheet.rst:6 msgid "Spreadsheet" -msgstr "" +msgstr "Planilha" #: ../../content/applications/finance/spreadsheet.rst:13 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/general.po b/locale/pt_BR/LC_MESSAGES/general.po index 62dbcfe8e..de779948b 100644 --- a/locale/pt_BR/LC_MESSAGES/general.po +++ b/locale/pt_BR/LC_MESSAGES/general.po @@ -11,8 +11,8 @@ # Marcel Savegnago <marcel.savegnago@gmail.com>, 2023 # Martin Trigaux, 2023 # Marcos Rodrigues, 2023 -# Kevilyn Rosa, 2023 # Layna Nascimento, 2023 +# Kevilyn Rosa, 2023 # #, fuzzy msgid "" @@ -21,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-05-30 12:32+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Layna Nascimento, 2023\n" +"Last-Translator: Kevilyn Rosa, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4759,7 +4759,7 @@ msgstr "" #: ../../content/applications/general/users/portal.rst:18 msgid "tickets" -msgstr "" +msgstr "chamados" #: ../../content/applications/general/users/portal.rst:19 msgid "signatures" diff --git a/locale/pt_BR/LC_MESSAGES/inventory_and_mrp.po b/locale/pt_BR/LC_MESSAGES/inventory_and_mrp.po index a2574d9ab..9fc970b13 100644 --- a/locale/pt_BR/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/pt_BR/LC_MESSAGES/inventory_and_mrp.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Layna Nascimento, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" @@ -4793,8 +4793,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4831,7 +4831,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4843,8 +4843,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4852,7 +4852,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4929,16 +4929,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4966,8 +4965,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -5008,9 +5007,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/pt_BR/LC_MESSAGES/marketing.po b/locale/pt_BR/LC_MESSAGES/marketing.po index 25f4a1907..e380edf81 100644 --- a/locale/pt_BR/LC_MESSAGES/marketing.po +++ b/locale/pt_BR/LC_MESSAGES/marketing.po @@ -9,6 +9,7 @@ # Éder Brito <britoederr@gmail.com>, 2023 # Martin Trigaux, 2023 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2023 +# Layna Nascimento, 2023 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-05-02 14:02+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>, 2023\n" +"Last-Translator: Layna Nascimento, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -942,7 +943,7 @@ msgstr "" #: ../../content/applications/marketing/marketing_automation.rst:8 #: ../../content/applications/marketing/marketing_automation/getting_started/first_campaign.rst:3 msgid "Marketing Automation" -msgstr "Automação de Marketing" +msgstr "MKT: Automação" #: ../../content/applications/marketing/marketing_automation.rst:11 #: ../../content/applications/marketing/sms_marketing.rst:11 @@ -1651,7 +1652,7 @@ msgstr "" #: ../../content/applications/marketing/sms_marketing.rst:8 msgid "SMS Marketing" -msgstr "Marketing SMS" +msgstr "Marketing por SMS" #: ../../content/applications/marketing/sms_marketing/essentials.rst:5 #: ../../content/applications/marketing/social_marketing/essentials.rst:5 @@ -2736,7 +2737,7 @@ msgstr "" #: ../../content/applications/marketing/social_marketing.rst:8 msgid "Social Marketing" -msgstr "Mídias Sociais" +msgstr "Redes Sociais" #: ../../content/applications/marketing/social_marketing/essentials/social_campaigns.rst:3 msgid "Social marketing campaigns" diff --git a/locale/pt_BR/LC_MESSAGES/productivity.po b/locale/pt_BR/LC_MESSAGES/productivity.po index 3f81b1d66..48d8676b3 100644 --- a/locale/pt_BR/LC_MESSAGES/productivity.po +++ b/locale/pt_BR/LC_MESSAGES/productivity.po @@ -10,9 +10,9 @@ # Luis Felipe Miléo <mileo@kmee.com.br>, 2023 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2023 # Éder Brito <britoederr@gmail.com>, 2023 -# Layna Nascimento, 2023 # Kevilyn Rosa, 2023 # Martin Trigaux, 2023 +# Layna Nascimento, 2023 # #, fuzzy msgid "" @@ -21,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-06-02 08:43+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" +"Last-Translator: Layna Nascimento, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4783,7 +4783,7 @@ msgstr "" #: ../../content/applications/productivity/studio.rst:6 msgid "Studio" -msgstr "Studio" +msgstr "Estúdio" #: ../../content/applications/productivity/studio.rst:17 msgid "" @@ -6261,7 +6261,7 @@ msgstr "" #: ../../content/applications/productivity/studio/pdf_reports.rst:39 msgid "Light" -msgstr "" +msgstr "Luz" #: ../../content/applications/productivity/studio/pdf_reports.rst:0 msgid "Light report layout sample" @@ -6975,7 +6975,7 @@ msgstr "" #: ../../content/applications/productivity/studio/views.rst:161 msgid "Map" -msgstr "" +msgstr "Mapa" #: ../../content/applications/productivity/studio/views.rst:163 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/sales.po b/locale/pt_BR/LC_MESSAGES/sales.po index 2694c1b59..197d699c1 100644 --- a/locale/pt_BR/LC_MESSAGES/sales.po +++ b/locale/pt_BR/LC_MESSAGES/sales.po @@ -4,7 +4,6 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Claudecir Garcia Martins, 2023 # Vanderlei P. Romera <vanderleiromera@gmail.com>, 2023 # Luis Gustavo Almeida <luis.gustavo@kmee.com.br>, 2023 # Éder Brito <britoederr@gmail.com>, 2023 @@ -20,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Layna Nascimento, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" @@ -91,6 +90,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1779,7 +1779,7 @@ msgstr "Seus clientes não serão mais capazes de guardar segredos de você!" #: ../../content/applications/sales/point_of_sale.rst:6 msgid "Point of Sale" -msgstr "Ponto de venda" +msgstr "Ponto de Venda" #: ../../content/applications/sales/point_of_sale.rst:8 msgid "" @@ -1816,8 +1816,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1826,9 +1827,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1855,45 +1856,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "Cadastre clientes" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "Na interface da sua sessão, use o botão do cliente." - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "Crie um novo usando este botão." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" -"Você será convidado a preencher o formulário do cliente com suas " -"informações." - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" -"Use o botão Salvar quando terminar. Você pode então selecionar esse cliente " -"em quaisquer transações futuras." - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1901,14 +1888,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1919,7 +1906,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1930,37 +1917,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "Devolução e reembolso de produtos" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1970,13 +1957,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1984,27 +1971,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -2018,31 +2005,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2597,116 +2584,111 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" -msgstr "Faça o login com o funcionário" +msgid "Multi-employee management" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -"Com Odoo *Ponto de Venda*, você pode administrar vários caixas. Este recurso" -" permite que você mantenha um registro de quem está trabalhando, quando e " -"quanto cada caixa fez para aquela sessão." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -"Há três maneiras de trocar de caixa em Odoo: *selecionando o caixa*, " -"*entregando um código PIN* ou *dirigindo um código de barras*." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -"Para administrar vários caixas, você precisa de vários funcionários (pelo " -"menos dois)." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" -msgstr "Estabelecer log in com os funcionários" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -"Para ativar o recurso, vá para suas *configurações *PoS* e verifique o login" -" com os funcionários em seu *formulário *PoS*. Em seguida, adicione os " -"funcionários que têm acesso à caixa registradora." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." -msgstr "Agora, você pode trocar de caixa facilmente." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "Mudar sem códigos PIN" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -"A maneira mais fácil de trocar de caixa é sem um código. Para fazer isso, " -"clique no nome do caixa em sua interface PdS." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." -msgstr "Agora, basta clicar em seu nome." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "Trocar o caixa com códigos de pinos" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" -"Você pode definir um código PIN em cada caixa. Para configurar um código " -"PIN, vá para o formulário de funcionário e adicione um PIN de segurança, na " -"guia *Configurações deHR*." #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "Agora, ao trocar de caixa, uma senha PIN será solicitada." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "Trocar o caixa com códigos de barras" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -"Você pode pedir a seus funcionários que se autentiquem com seus crachás. " -"Para fazer isso, configure um código de barras no mesmo local em que você " -"adiciona o código PIN. Imprima o crachá e quando eles o digitalizarem, o " -"caixa será trocado para aquele funcionário." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "Encontre quem era o caixa" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -"Uma vez fechada a sessão *PoS*, você pode ter uma visão geral do valor " -"vendido por cada caixa. Para fazer isso, vá para o menu de pedidos." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Análise" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" -"Agora, você pode abrir o pedido e ter um resumo dos produtos vendidos." #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 msgid "Payment methods" @@ -4235,21 +4217,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Faturas" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -4261,7 +4243,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -4269,23 +4251,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -4296,27 +4278,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "Recuperar faturas" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -4326,23 +4308,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -4356,7 +4338,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -5012,8 +4994,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 @@ -5179,7 +5162,7 @@ msgstr "" #: ../../content/applications/sales/rental.rst:3 msgid "Rental" -msgstr "Aluguel" +msgstr "Locação" #: ../../content/applications/sales/rental.rst:5 msgid "**Odoo Rental** is a comprehensive solution to manage your rentals." diff --git a/locale/pt_BR/LC_MESSAGES/websites.po b/locale/pt_BR/LC_MESSAGES/websites.po index 74ab2b3e9..320344b3e 100644 --- a/locale/pt_BR/LC_MESSAGES/websites.po +++ b/locale/pt_BR/LC_MESSAGES/websites.po @@ -10,8 +10,8 @@ # Jolien De Paepe, 2023 # Luis Felipe Miléo <mileo@kmee.com.br>, 2023 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2023 -# Martin Trigaux, 2023 # Kevilyn Rosa, 2023 +# Martin Trigaux, 2023 # Layna Nascimento, 2023 # #, fuzzy @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Layna Nascimento, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/odoo/teams/41243/pt_BR/)\n" @@ -495,7 +495,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -694,7 +694,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "Contas de clientes" @@ -1190,8 +1190,9 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" -msgstr "Analítico" +msgstr "Análise" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:36 msgid "" @@ -1226,13 +1227,12 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Produtos" #: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:3 msgid "Catalog" -msgstr "" +msgstr "Catálogo" #: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:5 msgid "" @@ -1832,11 +1832,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr ":doc:`/aplicações/inventário_e_mrp/inventário/gestão/produtos/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1847,12 +1847,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1860,15 +1860,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1876,11 +1876,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1892,15 +1892,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/aplicações/vendas/vendas/produtos_preços/preços/moedas''" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1912,7 +1912,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2910,7 +2910,7 @@ msgstr "doc:`ratings`" #: ../../content/applications/websites/website.rst:8 msgid "Website" -msgstr "Website" +msgstr "Site" #: ../../content/applications/websites/website.rst:10 msgid "" @@ -3058,546 +3058,287 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -"Os multi-sites da Odoo oferecem amplas possibilidades de diversificação e " -"segmentação de clientes para o seu negócio. Uma audiência multiplicada e " -"receita aumentada estão agora a apenas alguns cliques de distância!" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" -"Cada site pode funcionar de maneira totalmente independente, com seu tema, " -"marca, nome de domínio, cabeçalho e rodapé, páginas, idiomas, produtos, " -"postagens de blog, fórum, slides, eventos, canais de chat ao vivo, etc. " -"Vamos fazer um tour!" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Definição" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -"Para criar um novo site, vá para :menuselection:`Website --> Configuration " -"--> Settings`. O botão, *Criar um novo site*, encontra-se na primeira seção." -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "" +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -"No próximo prompt, defina um nome para seu novo site e um nome de domínio " -"específico. Deixe em branco para publicar o novo site sob o domínio padrão " -"de seu banco de dados Odoo. Posteriormente, você pode definir alguns grupos " -"de países para redirecionar os visitantes a ele usando Geo IP." #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -"Em seguida, selecione um tema. Este novo site pode ter um objetivo ou " -"público totalmente diferente do primeiro. Portanto, fique à vontade para " -"escolher um tema diferente!" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 -msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 +msgid "" +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -"Assim que o tema for selecionado, você pode começar a construir a página " -"inicial do seu site. Siga as gotas roxas; eles o ajudarão nos primeiros " -"passos." #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" -msgstr "Crie o menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -"O novo site tem um menu padrão com todas as aplicações instaladas. Para " -"editá-lo, clique em :menuselection:`Pages --> Edit Menu`. Seguindo em " -"frente, você só editará o menu do site atual." -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "Mudar de um site para outro" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -"Tão fácil quanto ABC! Há um alternador de sites no canto direito da barra de" -" edição. Mudar para outro site irá conectar ao domínio deste site. Se você " -"usar outro domínio para o site, o usuário será solicitado a fazer login." -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -"Ao trocar, você é redirecionado para o mesmo caminho de domínio no outro " -"website (por exemplo, ``/loja/miproduto```). Se esta URL não for utilizada, " -"você será redirecionado para uma página 404, mas será solicitado a criar uma" -" nova página a partir dela." -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Adicione Características" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -"Até recentemente, os usuários Odoo precisavam usar um provedor de serviços " -"CDN terceirizado, como o CloudFlare, para habilitar SSL." -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -"Cada site vem com uma grande variedade de opções específicas nas " -"configurações. Primeiro, selecione o site a ser configurado." -#: ../../content/applications/websites/website/configuration/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." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" -"Em seguida, dê uma olhada nas opções sinalizadas com o ícone de terra. Isso " -"significa que eles afetam apenas o site em que você está trabalhando." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "Você pode, por exemplo, definir específicos:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," -msgstr "idiomas," #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," -msgstr "nomes de domínio," +msgid "Records and features can be made available:" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," -msgstr "links de mídia social," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "modo de portal do cliente (B2C vs. B2B)," - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "canais de chat ao vivo dedicados," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "etc." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "As outras opções são globais e se aplicam a todos os seus sites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" -msgstr "Gerenciar nomes de domínio" - -#: ../../content/applications/websites/website/configuration/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 "" -"Como dito anteriormente, seus websites podem compartilhar o mesmo nome de " -"domínio ou usar um nome específico. Se você o compartilha e deseja adaptar o" -" conteúdo por região, defina grupos de países na configuração de cada " -"website. Os visitantes serão redirecionados para o website correto usando o " -"GeoIP." - -#: ../../content/applications/websites/website/configuration/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. See :doc:`on-premise_geo-ip-" -"installation`" -msgstr "" -"O Geo IP é instalado por padrão na Odoo Online. Se você executar o Odoo on-" -"premise, não se esqueça de instalar a biblioteca *GeoIP*. Veja " -":doc:`instalação no local_geo-ip" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Preços" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "Personalize a experiência do visitante" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -"A experiência do cliente pode ser personalizada muito profundamente graças " -"ao menu \\*Personalize\\*. Todas as opções visuais disponíveis são " -"específicas para cada site. Passe pelas diferentes páginas para adaptá-las a" -" esse novo público. Concentre-se em fluxos de trabalho e páginas automáticas" -" (checkout de eCommerce, blogs, eventos, etc.) à medida que o número de " -"opções disponíveis é maior lá." -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" -msgstr "Publique conteúdo específico por site" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Relatórios" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -"Assim como as páginas estáticas, qualquer conteúdo criado no front-end " -"(produto, postagem no blog, etc.) é sempre publicado apenas no site atual. " -"Você pode alterar isso na visualização do formulário de edição no backend e " -"deixar o campo * Site * em branco. Isso o publicará em todos os sites." -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" -"Aqui estão todos os objetos que você pode vincular a * um ou todos os sites " -"*:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "Categorias de produtos para comércio eletrônico" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blog" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "Canais de slides" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Fóruns" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Eventos" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Cargos" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" -"Quando você cria o registro do back-end e o publica, normalmente um produto " -"ou evento, ele é disponibilizado em todos os sites." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "Publique uma página em todos os sites" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" -"Uma nova página estática é criada e só está disponível no site atual. Você " -"pode duplicá-la para outros websites a partir de :menuselection:`Website -->" -" Configuration --> Pages'. Para fazer isso, deixe o campo *Website* vazio." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" -"Se você quiser duplicá-lo em apenas um outro site, duplique a página e " -"configure o novo site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" -"Quando você edita a página novamente, a alteração afeta apenas o site atual." -" Uma nova página é duplicada e vinculada ao site. A página original ainda " -"está vinculada a todos os sites." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" -"Ao agrupar as páginas por URL no gerenciador de páginas, você encontra " -"rapidamente a página original atrás de cada página editada." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multi-empresas" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" -"Cada site pode ser vinculado a uma empresa específica do seu sistema, em um " -"ambiente multiempresas." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" -"Com essa configuração, apenas os dados relativos à empresa aparecem no site " -"(produtos, empregos, eventos, etc.)." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" -"Os editores do site podem apenas visualizar e editar as páginas dos " -"registros aos quais eles têm acesso, normalmente aqueles pertencentes à sua " -"empresa atual (e às suas subsidiárias ou empresas filhas no idioma Odoo). E " -"assim é para os visitantes." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" -"Se os sites forem multiempresas, você não muda de empresa ao trocar de site." -" Para mudar de empresa e ver o conteúdo relacionado, use o seletor de " -"empresas no menu." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "Configure o seu site de comércio eletrônico" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" -"o comércio eletrônico é um recurso crucial no ambiente de vários sites. " -"Fizemos isso para que todo o fluxo possa ser customizado para se adequar ao " -"próprio público de cada site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "Produtos disponíveis apenas em um site" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" -"Já vimos anteriormente como publicar um registro específico em apenas um " -"site. Você encontrará o campo \\*Website\\* na guia eCommerce do formulário " -"de edição do produto. Meios vazios disponíveis em todos os sites." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "Produtos disponíveis em * alguns * sites" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" -"Para disponibilizar um produto em alguns sites, mas não em todos, você deve " -"duplicar o produto para cada site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" -"Se você precisar de uma referência exclusiva para gerenciar em seu estoque, " -"deve instalar *Manufatura\\e criar *Kits* BoMs (listas de materiais). Cada " -"kit vinculará cada produto “virtual” publicado à referência principal " -"gerenciada em seu inventário. Dessa forma, qualquer item vendido em seu site" -" será convertido em item armazenável na ordem de entrega." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Listas de preços" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" -"Para gerenciar preços específicos por sites, você pode ativar * Vários " -"preços de venda por produto * nas configurações do site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" -"Deixar o campo vazio significa que você o fará funcionar em todos os sites " -"se * Selecionável * estiver selecionado. Caso contrário, ele o torna " -"disponível apenas para operações de back-end de aplicativos de vendas e " -"ponto de venda." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" -"Há uma configuração para escolher como gerenciar contas de clientes nas " -"configurações do site. Você pode permitir que os clientes usem uma conta em " -"todos os sites ou obrigá-los a criar uma conta para cada site. Esta última " -"opção é conveniente se seus sites não devem ser relacionados entre si na " -"mente do visitante." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "Dicas técnicas para personalização" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" -"Se você deseja publicar objetos personalizados no site, aqui estão algumas " -"dicas para fazê-lo funcionar com vários sites:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" -"Mapa do site: não se esqueça do domínio no caminho para apenas publicar" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "registros disponíveis no mapa do site de cada site." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "Acesso: você deve chamar o método" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" -"*can_access_from_current_website* no controlador para garantir que o " -"visitante possa ver um registro no site atual." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" -"Pesquisa: quando uma lista de registros for exibida, não se esqueça de " -"especificar" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" -"o domínio para exibir apenas os registros disponíveis para o site atual." #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 msgid "Geo IP Installation (On-Premises Database)" @@ -5331,10 +5072,6 @@ msgstr "" "Sitemap personalizado). Tornar os dados do modelo da view *Non Updatable* " "para não reiniciar o arquivo após atualizações do sistema.</developer-mode>" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Relatórios" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "Como acompanhar o tráfego do seu site no Google Analytics" diff --git a/locale/ro/LC_MESSAGES/administration.po b/locale/ro/LC_MESSAGES/administration.po index 4c631d52a..22d470429 100644 --- a/locale/ro/LC_MESSAGES/administration.po +++ b/locale/ro/LC_MESSAGES/administration.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2023\n" "Language-Team: Romanian (https://app.transifex.com/odoo/teams/41243/ro/)\n" @@ -1750,7 +1750,7 @@ msgstr "" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "Odoo Online" @@ -3606,7 +3606,7 @@ msgstr "" #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -5509,6 +5509,8 @@ msgstr ":ref:`odoo_online/users`" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "Actualizează" @@ -6101,278 +6103,346 @@ msgstr "Această matrice arată starea de suport pentru fiecare versiune." msgid "**Major releases are in bold type.**" msgstr "**Lansările majore sunt în bold.**" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "On-Premise" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "Data lansării" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "Sfârșitul suportului" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "|green|" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "N/A" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "**Odoo 16.0**" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "Octombrie 2022" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "Octombrie 2025 (planificat)" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "Odoo saas~15.2" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "|red|" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "**Odoo 16.0**" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "Octombrie 2022" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "Octombrie 2025 (planificat)" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "Odoo saas~15.2" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "Martie 2022" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "Ianuarie 2023" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "Odoo saas~15.1" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "Februarie 2022" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "Iulie 2022" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "**Odoo 15.0**" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "Octombrie 2021" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "Octombrie 2024 (planificat)" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "**Odoo 14.0**" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "Octombrie 2020" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "Octombrie 2023 (planificat)" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "**Odoo 13.0**" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "Octombrie 2019" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "Odoo saas~12.3" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "August 2019" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "**Odoo 12.0**" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "Octombrie 2018" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "Odoo saas~11.3" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "Aprilie 2018" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "**Odoo 11.0**" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "Octombrie 2017" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "Odoo 10.saas~15" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "Martie 2017" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "Odoo 10.saas~14" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "Ianuarie 2017" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "**Odoo 10.0**" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "Octombrie 2016" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "Odoo 9.saas~11" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "Mai 2016" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "**Odoo 9.0**" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "Octombrie 2015" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "Odoo 8.saas~6" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "Februarie 2015" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "**Odoo 8.0**" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "Septembrie 2014" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "|green| Versiune suportată" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "|red| Sfârșitul suportului" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "N/A Nu a fost niciodată lansat pentru această platformă" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "🏁 Versiune viitoare, nu a fost încă lansată" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "Rulez o versiune mai veche de Odoo/OpenERP/TinyERP" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "" "OpenERP 7.0, 6.1, 6.0 și 5.0 nu mai sunt suportate, pe orice platformă." -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "" "TinyERP 4.0, 3.0, 2.0 și 1.0 nu mai sunt suportate, pe orice platformă." -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version <https://upgrade.odoo.com/>`_." @@ -7149,7 +7219,7 @@ msgstr "" "efecte secundare dacă sunt lansate mai des decât este așteptat." #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "Submodule" @@ -7572,7 +7642,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "Dezvoltare" @@ -7751,8 +7821,8 @@ msgid "Tabs" msgstr "Tab-uri" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "Istoric" @@ -7788,8 +7858,8 @@ msgstr "" "prin butonul *connect*." #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "Mail-uri" @@ -7851,7 +7921,7 @@ msgstr "" "Shell." #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "Monitorizare" @@ -7871,8 +7941,8 @@ msgstr "" "modificările construcției (importul bazei de date, git push, etc...)." #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "Jurnale" @@ -7933,7 +8003,7 @@ msgstr "" "după 5 minute. Puteți reporni utilizând butonul de redare." #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "Copii de rezervă" @@ -8072,9 +8142,9 @@ msgstr ":doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "Setări" @@ -10466,61 +10536,50 @@ msgstr "" "În plus, ei nu pot utiliza webshell-ul și nu au acces la jurnalele " "serverului." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "Utilizator" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "Admin" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "conectare 1-clic" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "Shell/SSH" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "Producție și stagiu" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "Stare" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "Acces public" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "Permite accesul public la construcțiile de dezvoltare." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." @@ -10528,7 +10587,7 @@ msgstr "" "Dacă este activată, această opțiune expune pagina Construcții public, " "permitând vizitatorilor să se conecteze la build-urile de dezvoltare." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." @@ -10536,7 +10595,7 @@ msgstr "" "În plus, vizitatorii au acces la jurnale, shell și e-mail-uri ale build-" "urilor de dezvoltare." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." @@ -10544,11 +10603,11 @@ msgstr "" "Build-urile de producție și stagiu sunt excluse, vizitatorii pot vedea doar " "starea lor." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "Domenii personalizate" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`." @@ -10557,7 +10616,7 @@ msgstr "" "de setări <odoosh-gettingstarted-branches-tabs-settings>` al ramurii " "corespunzătoare." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." @@ -10566,7 +10625,7 @@ msgstr "" "folosiți ca submodule în ramurile dvs. pentru a permite Odoo.sh să le " "descarce." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -10578,7 +10637,7 @@ msgstr "" "disponibile în capitolul :ref:`Submodule <odoosh-advanced-submodules>` din " "această documentație." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -10590,14 +10649,14 @@ msgstr "" "implementare pentru Odoo.sh, astfel încât serverul Git la distanță să " "permită platformei noastre să descarce reviziile acestui depozit privat." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "" "Pentru a configura cheia de implementare pentru un depozit privat, " "procedeziți astfel:" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," @@ -10605,11 +10664,11 @@ msgstr "" "în intrare, lipiți URL-ul SSH al sub-repozitorului privat și faceți clic pe " "*Adăugare*," -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "e.g. *git@github.com:USERNAME/REPOSITORY.git*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" @@ -10617,16 +10676,16 @@ msgstr "" "poate fi un alt server Git decât Github, cum ar fi Bitbucket, Gitlab sau " "chiar serverul propriu de găzduire" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "copiați cheia publică," -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "" "ar trebui să arate ca *ssh-rsa some...random...characters...here...==*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." @@ -10634,24 +10693,24 @@ msgstr "" "în setările sub-repozitorului privat, adăugați cheia publică printre cheile " "de implementare." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" "Github.com: :menuselection:`Setări --> Chei de implementare --> Adăugare " "cheie de implementare`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "" "Bitbucket.com: :menuselection:`Setări --> Chei de acces --> Adăugare cheie`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "" "Gitlab.com: :menuselection:`Setări --> Depozit --> Chei de implementare`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" @@ -10659,25 +10718,25 @@ msgstr "" "Auto-găzduit: adăugați cheia la fișierul authorized_keysutilizatorului git " "în directorul său .ssh" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "Dimensiunea spațiului de stocare" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "" "Această secțiune arată dimensiunea spațiului de stocare utilizat de " "proiectul dvs." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "Dimensiunea spațiului de stocare se calculează astfel:" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "dimensiunea bazei de date PostgreSQL" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." @@ -10685,7 +10744,7 @@ msgstr "" "dimensiunea fișierelor de disc disponibile în containerul dvs.: fișierul " "bazei de date, directorul de stocare sesiuni..." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "<https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell." @@ -10693,7 +10752,7 @@ msgstr "" "Dacă doriți să analizați utilizarea spațiului de disc, puteți rula " "instrumentul `ncdu <https://dev.yorhel.nl/ncdu/man>`_ în Web Shell." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." @@ -10701,11 +10760,11 @@ msgstr "" "Dacă dimensiunea bazei de date de producție crește pentru a depăși ceea ce " "este provisionat în abonamentul dvs., va fi automat sincronizat cu ea." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "Database Workers" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " @@ -10716,7 +10775,7 @@ msgstr "" "poate gestiona. Dacă adăugați mai multe, vor fi automat sincronizate cu " "abonamentul dvs." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -10731,11 +10790,11 @@ msgstr "" "personalizărilor dvs. puteți deschide un ticket `aici " "<https://www.odoo.com/help>`_." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "Staging Branches" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " @@ -10745,11 +10804,11 @@ msgstr "" "mai multe funcții în același timp. Dacă adăugați mai multe, vor fi automat " "sincronizate cu abonamentul dvs." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "Activare" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/ro/LC_MESSAGES/finance.po b/locale/ro/LC_MESSAGES/finance.po index 14808df7e..3c219ea1b 100644 --- a/locale/ro/LC_MESSAGES/finance.po +++ b/locale/ro/LC_MESSAGES/finance.po @@ -8,20 +8,20 @@ # Fenyedi Levente, 2023 # Vacaru Adrian <adrian.vacaru@gmail.com>, 2023 # Emanuel Bruda, 2023 -# Cozmin Candea <office@terrabit.ro>, 2023 # Martin Trigaux, 2023 # Hongu Cosmin <cosmin513@gmail.com>, 2023 -# Dorin Hongu <dhongu@gmail.com>, 2023 # Foldi Robert <foldirobert@nexterp.ro>, 2023 +# Cozmin Candea <office@terrabit.ro>, 2023 +# Dorin Hongu <dhongu@gmail.com>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Foldi Robert <foldirobert@nexterp.ro>, 2023\n" +"Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2023\n" "Language-Team: Romanian (https://app.transifex.com/odoo/teams/41243/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -588,10 +588,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -615,7 +615,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4641,6 +4641,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incotermeni" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "Procese de facturare" @@ -6787,6 +6878,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -8520,17 +8612,10 @@ msgstr "Urmărire a facturilor" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" -"Un mesaj de urmărire poate fi trimis clienților atunci când o plată este " -"întârziată. Odoo vă ajută să identificați plățile întârziate și vă permite " -"să programați și să trimiteți amintirile potrivite, utilizând **acțiuni de " -"urmărire** care declanșează automat o sau mai multe acțiuni în funcție de " -"numărul de zile întârziate. Puteți trimite urmăririle dvs. prin diferite " -"modalități, cum ar fi e-mail, poștă sau SMS." #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 msgid "" @@ -8543,129 +8628,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" -"Pentru a configura o :guilabel:`Acțiune de urmărire`, mergeți la " -":menuselection:`Contabilitate --> Configurare --> Nivele de urmărire`. Multe" -" acțiuni de urmărire sunt disponibile în mod implicit, și le puteți " -"personaliza în orice fel doriți sau crea noi pentru a declanșa următoarele " -"acțiuni:" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -"Este de asemenea posibil să trimiteți automat un amintire activând opțiunea " -":guilabel:`Auto Execute` într-o anumită :guilabel:`Acțiune de urmărire`." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" -"Pentru a trimite un amintire înainte ca data scadentă efectivă să fie " -"atingere, setați un număr negativ de zile scadente." #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 +msgid "" +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 +msgid "" +"Set a negative number of days to send a reminder before the actual due date." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:43 msgid "Follow-up reports" msgstr "Rapoarte de urmărire" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -"Facturile întârziate pe care trebuie să le urmăriți sunt disponibile în " -":menuselection:`Contabilitate --> Clienți --> Rapoarte de urmărire`. De " -"acolo, puteți identifica toți clienții care au facturi neplătite întârziate." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -"Când deschideți un client, veți vedea toate facturile neplătite ale lor " -"(întârziat sau nu). Datele scadente ale facturilor întârziate apar în roșu. " -"Selectați facturile care nu sunt încă întârziat în coloana " -":guilabel:`Excluded` pentru a le exclude din amintirea pe care o trimiteți." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" msgstr "" -"Este la latitudinea dvs. să decideți cum să amintiți clienții dvs. Puteți " -"selecta :guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send" -" By Post`, :guilabel:`Send By SMS`. Apoi, faceți clic pe :guilabel:`Done` " -"pentru a vedea următoarea urmărire care necesită atenția dvs." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." msgstr "" -"Informațiile de contact disponibile pe factură sau pe formularul de contact " -"se folosesc pentru a trimite amintirea." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "Când este trimis amintirea, este documentată în conversația facturii." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -"Dacă nu este momentul potrivit pentru o amintire, puteți specifica " -":guilabel:`Următoarea dată de amintire` și faceți clic pe " -":guilabel:`Amintiți mai târziu`. Veți primi următorul raport în funcție de " -"data următoarei amintiri setată pe declarație." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -"Reconciliați extrasele bancare înainte de a lansa procesul de urmărire " -"pentru a evita trimiterea unei amintiri unui client care v-a plătit deja." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "Nivelul de încredere al debitorului" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -8682,11 +8771,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "Setați nivelul de încredere al debitorului" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "Trimiteți amintiri în loturi" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -8698,15 +8787,15 @@ msgstr "" "doriți să le procesați, faceți clic pe pictograma :guilabel:`Action` și " "selectați :guilabel:`Process follow-ups`." -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr ":doc:`../../../general/in_app_purchase`" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -11170,19 +11259,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -11192,23 +11273,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -11216,7 +11285,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -11228,21 +11297,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "Configurarea produsului" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "Cod Marfă" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -11250,24 +11319,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -11275,7 +11344,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -11284,39 +11353,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -11327,96 +11396,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -11426,73 +11472,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -11855,7 +11901,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -12989,7 +13035,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -13164,52 +13210,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -13217,46 +13244,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Rapoarte" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -13793,70 +13834,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -13887,7 +13928,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Manual" @@ -15518,428 +15558,920 @@ msgstr "Cheltuieli" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -"**Odoo Expenses** simplifică gestiunea cheltuielilor. Angajații pot trimite " -"cheltuielile lor; managerii pot aproba; contabili pot înregistra " -"cheltuielile și procesa plățile." -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "Odoo Expenses: pagina produsului <https://www.odoo.com/app/expenses>" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "Cum să setați tipurile de cheltuieli" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"Primul pas pentru a urmări cheltuielile este să configurați tipurile de " -"cheltuieli (gestionate ca produse în Odoo) pe care compania dvs. le permite," -" din meniul *Configurare*. Când o cheltuială specifică este rembursată la un" -" preț fix, setați un cost pe produs. În caz contrar, păstrați costul la 0.0 " -"și angajații vor raporta costul real pe cheltuială." -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" -msgstr "Aiici sunt câteva exemple:" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." +msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "Restaurant:" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" -"Cheltuiala: 0.00 (costul biletului va fi înregistrat pe fiecare cheltuială)" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "Transport cu mașina personală:" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" -msgstr "Cheltuiala: 0.30 (prețul pe milă rembursat de companie este fix)" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "Hotel:" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "Altele:" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "Cheltuiala: 0.0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -"Nu uitați să setați o taxă de cheltuială pentru fiecare tip de cheltuială " -"(și un cont dacă utilizați Odoo Contabilitate). De obicei, este o bună " -"practică să utilizați o taxă care este configurată cu :ref:`Tax Included in " -"Price <taxes/included-in-price>`. Astfel, angajații raportează cheltuieli cu" -" prețuri care includ taxele, ceea ce este de obicei comportamentul așteptat." -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" -"Aplicația *Vânzări* vă permite să specificați unități de măsură pentru " -"tipurile de cheltuieli (unități, mile, nopți, etc.). Accesați " -":menuselection:`Vânzări ---> Configurare ---> Setări` și verificați *Unele " -"produse pot fi vândute / cumpărate în unități de măsură diferite (avansat)*." #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "Cum să înregistrați cheltuielile" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -"Ca angajat (Angajat în drepturile de acces ale utilizatorului), puteți " -"inregistra cheltuieli din :menuselection:`Cheltuielile mele --> Cheltuieli " -"de trimis`." -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" -"Selectați produsul asociat și introduceți fie suma totală pe care ați " -"plătit-o (cu Cantitate = 1) sau prețul unitar dacă Cantitatea este " -"numărabilă (de exemplu, numărul de nopți de hotel)." #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "Introduceți data cheltuielii." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -"Alegeți dacă ați plătit factura din banii dumneavoastra (și așteptați să " -"fiți rambursat) sau dacă compania a plătit direct (de exemplu, dacă ați " -"utilizat un card de credit al companiei)." -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" -"Setați referința facturii, adăugați câteva note dacă este solicitat și " -"atașați o fotografie / scanare de chitanță. Acest lucru va ajuta managerul " -"și contabilul să o valideze." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "Intr-un singur clic din e-mailuri" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "" -"Lasati angajatii sa inregistreze cheltuielile lor dintr-un e-mail simplu. " -"Faceți o fotografie a chitanței și trimiteți-o prin e-mail, sau pur și " -"simplu trimiteți o factură!" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"Singurul lucru de făcut este să setați un alias de e-mail în " -":menuselection:`Cheltuieli --> Configurare --> Setări` (de exemplu, " -"*cheltuieli* @mycompany.odoo.com). Din motive de securitate, sunt acceptate " -"doar e-mailuri de angajați autentificate (cfr. *E-mail de lucru* în " -"formularul detaliat al angajatului)." -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -"Produsul de cheltuieli este setat automat dacă subiectul e-mailului conține " -"referința internă a produsului în prima poziție. Introduceți suma " -"cheltuielilor în subiectul e-mailului pentru a o seta și pe cheltuieli (de " -"exemplu, Ref001 Mâncare 100€)." -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "Cum să trimiteți cheltuieli managerilor" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -"Cand sunteti gata sa trimiteți cheltuielile la managerul dumneavoastra (de " -"exemplu, la sfârșitul unui deplasament de afaceri, sau o dată pe lună), " -"mergeți la meniul :menuselection:`Cheltuielile mele --> Cheltuieli de " -"trimis`. Selectați toate cheltuielile din vizualizarea listei și faceți clic" -" pe :menuselection:`Acțiune --> Trimiteți la manager`. Salvați noul raport " -"de cheltuieli creat (adică setul de cheltuieli) și așteptați ca managerul " -"dumneavoastră să aprobe." -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -"Puteți trimite și cheltuieli individual, de la butonul *Trimiteți la " -"manager* pe vizualizarea formularului unei cheltuieli." -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "Cum să aprobați cheltuieli" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"HR și managerii de echipă primesc o privire de ansamblu asupra tuturor " -"rapoartelor de cheltuieli de validat din meniul principal :menuselection:`De" -" aprobat --> Rapoarte de cheltuieli de aprobat`. Acești utilizatori trebuie " -"să aibă cel puțin drepturi de acces *Ofițeri* pentru *Cheltuieli*." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -"Ei pot revizui rapoartele de cheltuieli, să le aprobe sau să le respingă, " -"precum și oferea feedback prin intermediul instrumentului de comunicare " -"integrat." -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -"Ca si manager de echipă puteți găsi ușor rapoartele de cheltuieli ale " -"membrilor echipei dumneavoastră. Trebuie să fiți setat ca manager în " -"formularul de detaliu al acestor angajați." -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "Cum să postați cheltuieli în contabilitate" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"Odată ce rapoartele de cheltuieli sunt aprobate de manageri, departamentul " -"de contabilitate merge la :menuselection:`Cheltuieli --> Contabil --> " -"Rapoarte de cheltuieli de postat` pentru verificați conturile, produsele și " -"impozitele. Ei pot face clic pe *Postați înregistrările jurnalului* pentru " -"postați înregistrările jurnalului în cărțile dumneavoastră. Pentru a face " -"acest lucru, utilizatorul trebuie să aibă următoarele drepturi de acces:" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "Contabilitate: Contabil sau Consilier" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "Cheltuieli: Manager" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"Pentru a posta o cheltuială, o *Adresă de domiciliu* trebuie să fie setată " -"pe angajat. Dacă primiți un mesaj de blocare în legătură cu postarea, faceți" -" clic pe angajat, mergeți la*Informații personale* fila și selectați/creați " -"contactul angajatului dumneavoastră în agenda de adrese. Un contact a fost " -"creat automat dacă această persoană folosește Odoo." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "Cum se face rambursarea catre angajați" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"Acum puteți vedea toate rapoartele de cheltuieli de rambursat " -"în:menuselection:`Cheltuieli --> Contabil --> Rapoarte de cheltuieli de " -"plată`. Pentru înregistrați plata sau plătiți prin cec, faceți clic pe " -"*Înregistrați o plată*." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "Cum puteți gestiona ușor procesul de plată în Odoo:" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "Cum să re-facturați cheltuielile către clienții dumneavoastră" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -"Daca urmăriți cheltuielile pe proiecte de client, le puteți încărca automat " -"înapoi către clienții dumneavoastră." -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "Explicație:" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "Contabilitate: Contabil sau Consilier" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "Cheltuieli: Manager" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "Refacturați cheltuielile către clienți" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Configurare" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "Permiteți **Facturare client** în setările Cheltuielilor" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -"Mergeți la meniul de configurare a produsului și setați metoda de facturare " -"pe toate tipurile dumneavoastră de cheltuieli:" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -"Cantități comandate: va factura cheltuielile în funcție de cantitatea " -"comandată" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -"Cantități livrate: va factura cheltuielile în funcție de cantitatea livrata" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." -msgstr "La cost: va factura cheltuielile la costul lor real." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" +msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -"La prețul de vânzare: va factura în funcție de un preț de vânzare fix setat " -"pe comanda de vânzare." -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "Crează o comandă" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -"Ca agent de vanzare, creați și confirmați o comandă de vânzare pentru " -"serviciile livrate către clientul dumneavoastră. Dacă nu introduceți nicio " -"cheltuială în comandă, aceasta va fi adăugat automat după ce a fost postat " -"de către contabil." -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "Linkul cheltuielii la comanda de vânzare." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "Trimite, validează și postează cheltuieli" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -"Ca si manager, asigurați-vă că contul analitic este setat pe fiecare linie " -"de cheltuieli pe aprobarea rapoartelor de cheltuieli. Faceți clic pe linie " -"pentru a adăuga una dacă lipsește. Angajații sunt deja capabili să seteze " -"unul când se depun." -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "Ca si contabil, postați intrările în jurnal." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "Cheltuieli de facturare" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"Acum puteți factura comanda. Apare în :menuselection:`Vânzări --> Facturare " -"--> Vânzări` pentru facturare. Cheltuielile au fost adăugate automat în " -"linii de comandă. Asemenea articole apar în albastru (adică pentru " -"facturare)." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -17824,10 +18356,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "Introduceți suma procentului." -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Rapoarte" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -27199,7 +27727,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -27499,7 +28027,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -32147,7 +32675,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "Tabul Credentiale" @@ -32425,14 +32952,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -32440,7 +32967,7 @@ msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -32532,22 +33059,25 @@ msgstr "Cheia API si Cheia Client" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -"Ca sa obtineti cheia API si cheia client, va rugam sa va logati in contul " -"Adyen, apoi sa mergeti la :menuselection:`Developers --> API Credentials`. -" -" Daca aveti deja un utilizator API, deschideti-l. - Daca nu aveti inca un " -"utilizator API, apasati pe **Create new credential**. Mergeti la " -":menuselection:`Server settings --> Authentification` si copiati sau " -"generati **API Key**. Aveti grija sa copiati cheia API deoarece nu veti " -"putea sa o obtineti mai tarziu fara a genera una noua." -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " @@ -32558,11 +33088,11 @@ msgstr "" ":ref:`permite platilor sa fie facute de pe site-ul dvs. " "<adyen/allowed_origins>`." -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "Cheia HMAC" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -32578,7 +33108,7 @@ msgstr "" msgid "Configure a webhook." msgstr "Configurare webhook." -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -32590,7 +33120,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "Introduceti URL-ul de notificare." -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -32604,41 +33134,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "Generati o cheie HMAC si salvati-o." -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "Trebuie sa salvati webhook-ul pentru a finaliza crearea lui." -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "Url-uri" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 -msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +msgid "API URLs" msgstr "" -"Pentru a obtine URL-urile, va rugam sa va logati in contul Adyen, apoi sa " -"mergeti la :menuselection:`Developers --> API URLs`. Selectati una din URL-" -"urile afisate langa :guilabel:`Classic Recurring API` ca " -":guilabel:`Recurring API URL` si una afisata langa :guilabel:`Checkout API` " -"ca :guilabel:`Checkout API URL`." -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." -msgstr "Obtineti link-urile pentru diferitele API-uri." +#: ../../content/applications/finance/payment_providers/adyen.rst:96 +msgid "" +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" +msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Ayden Account" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "Permiteti platile de la o origine specifica" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -32654,20 +33223,20 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "Permite platile provenite de la un domeniu specific." -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "Aplicati o retinere pe un card" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" "Ayden permite capturarea sumei manual in loc de a avea o captura imediata." -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " @@ -32677,7 +33246,7 @@ msgstr "" "dupa cum este explicat in :ref:`documentatia furnizorilor de plata " "<payment_providers/features/manual_capture>`." -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -32690,7 +33259,7 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "Capturare setari Delay in Adyen" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" @@ -32700,7 +33269,7 @@ msgstr "" "**Capture Delay** este setat la **manual** in Adyen. In caz contrar, " "tranzactia va fi blocata in starea autorizata in Odoo." -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " @@ -32710,7 +33279,7 @@ msgstr "" "captura partiala din interfata Adyen, Odoo o va gestiona ca si cum ar fi o " "captura completa." -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -33778,7 +34347,7 @@ msgstr "" "afișată, etc." #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "Setări în Odoo" @@ -33797,245 +34366,131 @@ msgstr "" "<ogone/ogone>`." #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" -"`Paypal <https://www.paypal.com/>`_ este disponibil și popular în toată " -"lumea. Nu percepe niciun abonament, și crearea unui cont este foarte ușoară." -" De aceea, îl recomandăm pentru începători în Odoo. Funcționează ca un flux " -"fără cusur, unde clientul este direcționat către site-ul Paypal pentru " -"înregistrarea platii." #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -"Odoo are nevoie de **API Credentials** pentru a se conecta cu contul dvs. " -"PayPal, care cuprind:" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." -msgstr "**Email**: adresa dvs. de email de login în Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" +msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -"**PDT Identity Token**: cheia utilizată pentru a verifica autenticitatea " -"tranzacțiilor." -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -"**Use IPN**: dacă doriți să utilizați Instant Payment Notification. Deja " -"bifat, nu trebuie să-l schimbați." -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -"Puteti copia credentialele dvs. din contul dvs. Paypal și le puteți lipi în " -"câmpurile relevante din tabul **Credentials**." -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -"Pentru a seta **PDT Identity Token**, treceți la :ref:`developer mode " -"<developer-mode>` și obțineți tokenul urmând pașii de configurare: " -":ref:`paypal/enable-pdt`." -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -"Daca încercați Paypal ca test, folosind un :ref:`Paypal Sandbox account " -"<paypal/testing>`, schimbați **State** în *Test Mode*. Recomandăm să faceți " -"aceasta pe o bază de date de test Odoo, nu pe o baza de date principală." -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" -msgstr "Tabul Taxe" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" +msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" -"Pueteti percepe taxe suplimentare clienților pentru plata cu Paypal pentru a" -" acoperi taxele de tranzacție pe care Paypal le percepe. După ce este " -"redirecționat către Paypal, clientul dvs. vede o sumă suplimentară aplicată " -"sumei comenzii." - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" -"Pentru a activa aceasta, mergeți la :guilabel:`Fees` tabul de configurare " -"Paypal în Odoo și activați :guilabel:`Add Extra Fees`." - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" -"Va puteti referi la `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ pentru a seta taxele." - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ nu sunt permise să perceapă taxe suplimentare pentru plata " -"cu carduri de credit." - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "Setari in Paypal" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" -"Prima data, setați contul dvs. Paypal pentru a crea o experiență de client " -"fără cusu" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." -msgstr "" -"Logați-vă în contul dvs. PayPal și deschideți setările contului. Apoi, " -"mergeți la :menuselection:`Account menu --> Account settings --> Website " -"payments`." #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" -msgstr "Activati Auto Return" +msgid "PayPal Account Optional" +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -"Caracteristica *Auto Return* redirecționează automat clienții dvs. către " -"Odoo odată ce plata este procesată." -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." -msgstr "" -"In pagina de setari *Website payments*, mergeti la :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` si selectati " -"**On**. Introduceti adresa bazei de date Odoo (de exemplu, " -"`https://yourcompany.odoo.com`) in campul **Return URL**." - -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." -msgstr "" -"Orice URL va face treaba. Odoo are nevoie doar ca setarea sa fie activata " -"deoarece foloseste alt URL." - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "Activati Payment Data Transfer (PDT)" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" -"Activati caracteristica *Payment Data Transfer* pentru a primi confirmari " -"imediate de plata. Aceasta caracteristica afiseaza de asemenea statusul " -"platii catre clienti si verifica autenticitatea platilor." - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" -"In pagina de setari *Website payments*, mergeti la :menuselection:`Website " -"preferences --> Update --> Payment data transfer` si selectati **On**. " -"PayPal afiseaza **PDT Identity Token** imediat ce schimbarea este salvata." - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "Cont Paypal Optional" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" -"Va sfatuim sa nu solicitati clientilor sa se autentifice cu un cont Paypal " -"cand ajung sa plateasca. Lasati-i sa plateasca cu carduri de debit/credit. " -"Asigurati-va ca aceasta setare este activata." - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "Formatul mesajelor de plata" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 +#: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -"sa presupunem ca folositi caractere accentuate (sau orice altceva decat " -"caracterele latine primare) pentru numele sau adresele clientilor. In acest " -"caz, **trebuie** sa configurati formatul de codare al cererii de plata " -"trimise de Odoo catre Paypal. In caz contrar, unele tranzactii nu vor reusi " -"fara avertizare." -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -"Pentru a face acest lucru, accesati `contul dvs. " -"<https://www.paypal.com/cgi-bin/customerprofileweb ?cmd=_profile-language-" -"encoding>`_. Apoi, faceti click pe *More Options* si setati cele doua " -"formate de codare ca **UTF-8**." -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "Contul dvs. Paypal este gata!" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -34048,7 +34503,7 @@ msgstr "" "standard/integration-guide/ encryptedwebpayments#encrypted-website-payments-" "ewp>`_." -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -34060,37 +34515,106 @@ msgstr "" "bin/customerprofileweb?cmd=_profile-language-encoding>`_ pentru a configura " "formatul de codare in mediul de testare." -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" -msgstr "Mediu de testare" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Credențiale" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:98 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" -"Multumita conturilor Sandbox Paypal, puteti testa intregul flux de plata in " -"Odoo." #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -"Logati-va in `Paypal Developer Site <https://developer.paypal.com/>`_ " -"folosind credentialele dvs. Paypal, care creeaza doua conturi sandbox" +"Va puteti referi la `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ pentru a seta taxele." -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "Mediu de testare" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -"Un cont de afaceri (pentru a fi folosit ca comercianti, de ex., " -"pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." @@ -34098,20 +34622,17 @@ msgstr "" "Un cont personal implicit (pentru a fi folosit ca cumparatori, de ex., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -"Logati-va in Paypal Sandbox folosind contul de comerciant si urmati aceleasi" -" instructiuni de configurare. Introduceti credentialele dvs. sandbox in Odoo" -" si asigurati-va ca Paypal este setat pe *Test Mode*. Va recomandam sa " -"faceti acest lucru pe o baza de date Odoo de testare, nu pe o baza de date " -"principala." -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" "Faceti o tranzactie de testare din Odoo folosind contul personal sandbox." diff --git a/locale/ro/LC_MESSAGES/inventory_and_mrp.po b/locale/ro/LC_MESSAGES/inventory_and_mrp.po index efb885c1a..b6082847b 100644 --- a/locale/ro/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/ro/LC_MESSAGES/inventory_and_mrp.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Cozmin Candea <office@terrabit.ro>, 2023\n" "Language-Team: Romanian (https://app.transifex.com/odoo/teams/41243/ro/)\n" @@ -5617,8 +5617,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -5655,7 +5655,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -5667,8 +5667,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -5676,7 +5676,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -5753,16 +5753,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -5790,8 +5789,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -5832,9 +5831,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/ro/LC_MESSAGES/sales.po b/locale/ro/LC_MESSAGES/sales.po index bc2e9a449..a205f053b 100644 --- a/locale/ro/LC_MESSAGES/sales.po +++ b/locale/ro/LC_MESSAGES/sales.po @@ -8,17 +8,17 @@ # Hongu Cosmin <cosmin513@gmail.com>, 2023 # Lyall Kindmurr, 2023 # Cozmin Candea <office@terrabit.ro>, 2023 -# Martin Trigaux, 2023 # Dorin Hongu <dhongu@gmail.com>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Romanian (https://app.transifex.com/odoo/teams/41243/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,6 +87,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1949,12 +1950,10 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" -"Mai mulți utilizatori pot fi conectați la aceeași sesiune în același timp. " -"Cu toate acestea, sesiunea poate fi deschisă o singură dată în același " -"browser." #: ../../content/applications/sales/point_of_sale.rst:32 msgid "Sell products" @@ -1962,16 +1961,11 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" -"Faceți clic pe produse pentru a le adăuga în coș. Pentru a modifica ** " -"cantitatea **, faceți clic pe :guilabel:`Cantitate` și introduceți numărul " -"de produse folosind tastatura. Pentru a adăuga o ** reducere ** sau modifica" -" ** prețul ** produsului, faceți clic pe :guilabel:`% Disc` sau " -":guilabel:`Preț` și introduceți sumele." #: ../../content/applications/sales/point_of_sale.rst:38 msgid "" @@ -2003,44 +1997,31 @@ msgstr "" "alege o metoda de plată." #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "Înregistrați clienți" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "Din interfața sesiunii dvs., utilizați butonul client." - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "Creați unul nou utilizând acest buton." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" -"Veți fi invitați să completați formularul clientului cu informațiile lor." - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" -"Utilizați butonul de salvare atunci când ați terminat. Puteți selecta apoi " -"acel client în orice tranzacție viitoare." - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -2048,14 +2029,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -2066,7 +2047,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -2077,33 +2058,33 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "Returnați și rambursați produse" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "Pentru a returna și rambursa un produs," -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" "faceți clic pe :guilabel:`Rambursare` și selectați comanda corespunzătoare;" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "selectați produsul și cantitatea de returnat folosind tastatura;" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" "faceți clic pe :guilabel:`Returnare` pentru a reveni la ecranul anterior;" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" @@ -2111,7 +2092,7 @@ msgstr "" "după ce comanda este completă, faceți clic pe :guilabel:`Plată` pentru a " "trece la returnare;" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -2123,7 +2104,7 @@ msgstr "" msgid "refund view from a POS" msgstr "vizualizare returnare dintr-un PdV" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." @@ -2131,7 +2112,7 @@ msgstr "" "Puteți filtra ** lista de comenzi ** după :guilabel:`Număr de primire`, " ":guilabel:`Data` sau :guilabel:`Client` folosind bara de căutare." -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -2144,11 +2125,11 @@ msgstr "" ":guilabel:`Cantitate` și :guilabel:`+/-`, urmat de cantitatea de produse " "returnate." -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "Închideți sesiunea PdV" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " @@ -2159,16 +2140,16 @@ msgstr "" ":guilabel:`Control închidere`. De pe acest ecran, puteți obține diverse " "informații:" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "numărul de comenzi și suma totală încasată în timpul sesiunii;" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "sumele așteptate grupate după metoda de plată." -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -2189,7 +2170,7 @@ msgstr "" msgid "How to close a POS session." msgstr "Cum să închideți o sesiune PdV." -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." @@ -2197,7 +2178,7 @@ msgstr "" "Odată ce ați terminat controlul sumelor, faceți clic pe :guilabel:`Închideți" " sesiunea` pentru a închide și pentru a reveni la **Tabloul de bord PdV**." -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." @@ -2205,19 +2186,19 @@ msgstr "" "Puteți lăsa sesiunea deschisă făcând clic pe :guilabel:`Backend` sau anulați" " și continuați vânzarea făcând clic pe :guilabel:`Renunțare`." -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "Este recomandat să închideți sesiunea PdV la sfârșitul fiecărei zile." -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2788,118 +2769,111 @@ msgid ":doc:`epos_ssc`" msgstr ":doc:`epos_ssc`" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" -msgstr "Autentificare angajat" +msgid "Multi-employee management" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -"Cu Odoo *Punct de vânzare*, puteți gestiona mai mulți casieri. Această " -"funcție vă permite să țineți evidența cine lucrează, când și cât a făcut " -"fiecare casier pentru acea sesiune." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -"Sunt trei modalități de a comuta între casieri în Odoo: prin *selectarea " -"casierului*, prin *introducerea unui cod PIN* sau prin *scanarea unui cod de" -" bare*." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -"Pentru a gestiona mai mulți casieri, aveți nevoie de mai mulți angajați (cel" -" puțin doi)." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" -msgstr "Configurați autentificarea angajaților" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -"Pentru a activa această funcție, accesați *Setările PoS* și verificați " -"autentificarea angajaților în formularul *PoS*. Apoi, adăugați angajații " -"care au acces la casierie." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." -msgstr "Acum, puteți comuta între casieri ușor." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "Comutați fără coduri PIN" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -"Cel mai ușor mod de a comuta între casieri este fără cod. Pentru a face " -"acest lucru, faceți clic pe numele casierului în interfața PoS." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." -msgstr "Acum, trebuie doar să faceți clic pe numele dvs." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "Comutați între casieri cu coduri PIN" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" -"Puteți seta un cod PIN pentru fiecare casier. Pentru a seta un cod PIN, " -"accesați formularul angajatului și adăugați un cod PIN de securitate, în " -"fila *Setări HR*." #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "Acum, când comutați între casieri, va fi solicitată o parolă PIN." - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "Comutați între casieri cu coduri de bare" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -"Puteți solicita angajaților să se autentifice cu ajutorul unei cartele de " -"identitate. Pentru a face acest lucru, setați un cod de bare la același loc " -"unde adăugați codul PIN. Imprimați cartela și când vor scana, casierul va fi" -" comutat la acel angajat." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "Găsiți cine a fost casierul" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -"Odată ce ați închis *Sesiunea PoS*, puteți avea o privire de ansamblu asupra" -" sumei vândute de fiecare casier. Pentru a face acest lucru, accesați meniul" -" comenzi." -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Statistici" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" -"Acum, puteți deschide comanda și aveți un rezumat al produselor vândute." #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 msgid "Payment methods" @@ -4631,11 +4605,11 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Facturi" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." @@ -4643,11 +4617,11 @@ msgstr "" "În Punct de vânzare, puteți emite și imprima facturi când încasați la " "casierie sau recupera toate comenzile facturate în trecut." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "Setați un client" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -4663,7 +4637,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "butonul de selecție și creare a clientului" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -4676,7 +4650,7 @@ msgstr "" "informațiile lor. Faceți clic pe :guilabel:`Salvați` pentru a valida și seta" " acest nou client." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." @@ -4684,7 +4658,7 @@ msgstr "" "Puteți, de asemenea, **edita** informațiile unui client făcând clic pe " ":guilabel:`Detalii`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." @@ -4692,11 +4666,11 @@ msgstr "" "Dacă nu ați setat clientul în timpul comenzii, puteți face acest lucru în " "ecranul de plată făcând clic pe :guilabel:`Client`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "Facturați către un client" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -4711,7 +4685,7 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "butonul pentru generarea unei facturi în POS" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." @@ -4720,15 +4694,15 @@ msgstr "" "**Factura** este emisă automat și este gata pentru a fi descărcată și/sau " "imprimată." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "Recuperare facturi" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "Pentru a recupera facturile din **panoul de bord POS**, " -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" @@ -4736,7 +4710,7 @@ msgstr "" "accesați toate comenzile efectuate prin POS accesând :menuselection:`Punct " "de vânzare --> Comenzi --> Comenzi`; " -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -4748,13 +4722,13 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "butonul inteligent de factură dintr-un formular de comandă" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." @@ -4762,11 +4736,11 @@ msgstr "" "Puteți filtra lista de comenzi pentru comenzile facturate făcând clic pe " ":guilabel:`Filtre` și :guilabel:`Facturat`." -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -4780,7 +4754,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -5498,8 +5472,9 @@ msgstr "Conectarea unui angajat" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/ro/LC_MESSAGES/websites.po b/locale/ro/LC_MESSAGES/websites.po index c83bb4270..d13c7d587 100644 --- a/locale/ro/LC_MESSAGES/websites.po +++ b/locale/ro/LC_MESSAGES/websites.po @@ -10,15 +10,16 @@ # Cozmin Candea <office@terrabit.ro>, 2023 # Dorin Hongu <dhongu@gmail.com>, 2023 # Martin Trigaux, 2023 +# Emanuel Bruda, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-13 05:55+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" +"Last-Translator: Emanuel Bruda, 2023\n" "Language-Team: Romanian (https://app.transifex.com/odoo/teams/41243/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -495,8 +496,9 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 msgid "Configuration" msgstr "Configurare" @@ -693,7 +695,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "Conturi de client" @@ -1189,6 +1191,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Statistici" @@ -1225,7 +1228,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Produse" @@ -1722,24 +1724,23 @@ msgid "" "To add a tax on a product, you can either set a tax in the " ":guilabel:`Customer Taxes` field of the **product template** or use " ":doc:`fiscal positions " -"</applications/finance/accounting/taxation/taxes/fiscal_positions>`." +"</applications/finance/accounting/taxes/fiscal_positions>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxes`" +msgid ":doc:`/applications/finance/accounting/taxes`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/avatax`" +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxcloud`" +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 -msgid "" -":doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`" +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 @@ -1789,7 +1790,7 @@ msgid "Tax type displayed on the product page" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/B2B_B2C`" +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 @@ -1833,11 +1834,11 @@ msgid "" msgstr "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1848,12 +1849,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1861,15 +1862,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1877,11 +1878,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1893,15 +1894,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1913,7 +1914,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2943,571 +2944,425 @@ msgstr "" "construiți site-uri web frumoase care să transforme vizitatorii în lead-uri " "sau venituri." +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 +msgid "" +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 +msgid "" +"Essential cookies, which are necessary for the website to function properly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 +msgid "" +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 +msgid "" +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR <https://gdpr.eu>`_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 +msgid "" +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 +msgid "" +"You can :ref:`customize the appearance of your cookies bar <cookies-" +"bar/customization>` and :ref:`edit the content of the related Cookie Policy " +"page <cookies-bar/policy>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 +msgid "" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 +msgid "" +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 +msgid "" +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 +msgid "" +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 +msgid "" +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 +msgid "" +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 +msgid "" +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 +msgid "" +"You could add a link providing access to this page, in your website's " +"footer, for example." +msgstr "" + #: ../../content/applications/websites/website/configuration/multi_website.rst:3 msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -"Odoo Multi-Websites deschide larg posibilitățile de diversificare și " -"segmentare a clienților pentru afacerea dvs. O publicitate multiplicată și " -"venituri îmbunătățite sunt acum la doar câteva clicuri!" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" -"Fiecare site poate funcționa într-un mod complet independent, cu tema, " -"branding-ul, numele de domeniu, antetul și subsolul, paginile, limbile, " -"produsele, postările blogului, forumul, prezentările, evenimentele, canalele" -" de chat live, etc. Hai să facem o vizită!" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Configurare" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -"Pentru a crea un nou site, accesați :menuselection:`Website --> " -"Configuration --> Settings`. Butonul, *Create a new website*, se află în " -"prima secțiune." -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "" +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -"În prompt-ul următor, setați un nume pentru noul site și un nume de domeniu " -"specific. Lăsați gol pentru a publica noul site sub domeniul implicit al " -"bazei de date Odoo. Puteți seta mai târziu anumite grupuri de țări pentru a " -"redirecționa vizitatorii către acesta utilizând Geo IP." #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -"În continuare, selectați o temă. Acest nou site ar putea avea un scop sau un" -" public țintă complet diferit față de primul. Deci, nu ezitați să mergeți " -"pentru o temă diferită!" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 -msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 +msgid "" +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -"Odată ce tema este selectată, puteți începe să construiți pagina de pornire " -"a site-ului dvs. Urmați sugestiile propuse prinpicăturile violete din ecran;" -" ele vă vor ajuta în primele pași." #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -"Dacă rulați Odoo Online, nu uitați să redirecționați orice nume de domeniu " -"nou către baza de date Odoo (``CNAME``) și să-l autorizați Odoo-side. Vedeți" -" :ref:`domain-name/existing`." -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" -msgstr "Creați meniul" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -"Site-ul nou are un meniu implicit cu toate aplicațiile instalate. Pentru " -"editare, faceți clic pe :menuselection:`Pagini --> Edit Menu`. Înainte de " -"toate, editați meniul site-ului curent." -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "Comutați de la un site la altul" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -"La fel de ușor ca ABC! Există un comutator de site-uri în colțul drept al " -"barei de editare. Comutarea la alt site se conectează la domeniul acestui " -"site. Dacă utilizați alt domeniu pentru site, utilizatorul este solicitat să" -" se autentifice." -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -"Când comutați, sunteți redirecționat către aceeași cale de domeniu pe alt " -"site (de exemplu, ``/shop/myproduct``). Dacă această adresă URL nu este " -"utilizată, veți fi redirecționat către o pagină 404, dar vă va fi solicitat " -"să creați o pagină nouă de acolo." -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Adăugați caracteristici" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -"Aplicațiile site-ului pe care le instalați (de exemplu, Slides, Blogs) sunt " -"disponibile pe toate site-urile dvs. Puteți, desigur, să le păstrați ascunse" -" într-un site eliminând elementul de meniu." -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -"Fiecare site vine cu o gamă largă de opțiuni specifice în setări. În primul " -"rând, selectați site-ul de configurat." -#: ../../content/applications/websites/website/configuration/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." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" -"În continuare, consultați opțiunile marcate cu pictograma pământului. " -"Aceasta înseamnă că ele afectează doar site-ul pe care lucrați." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "Puteți, de exemplu, seta specific:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," -msgstr "limbi," #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," -msgstr "nume de domeniu," +msgid "Records and features can be made available:" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," -msgstr "link-uri de rețele sociale," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "modul portalului clienților (B2C vs. B2B)," - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "canale dedicate de chat live," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "etc." +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "Alte opțiuni sunt globale și se aplică tuturor site-urilor dvs." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" -msgstr "Gestionați numele de domeniu" - -#: ../../content/applications/websites/website/configuration/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." +msgid "Select the website on which the page is currently published." msgstr "" -"Ca am spus mai devreme, site-urile dvs. pot partaja același nume de domeniu " -"sau pot utiliza unul specific. Dacă îl partajați și doriți să adaptați " -"conținutul pe regiune, setați grupuri de țări în setările fiecărui site. " -"Vizitatorii vor fi redirecționați către site-ul potrivit utilizând GeoIP." -#: ../../content/applications/websites/website/configuration/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" msgstr "" -"Geo IP este instalat în mod implicit în Odoo Online. Dacă rulați Odoo on-" -"premise, nu uitați să instalați biblioteca *GeoIP*. Vedeți: doc: `on-" -"premise_geo-ip-installation`" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr ":doc:`/administration/maintain/domain_names`" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 -msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" -"Dacă configurați un site suplimentar și specificați numele de domeniu, va " -"trebui să faceți trei lucruri pentru ca această caracteristică să " -"funcționeze:" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -"Configurați o înregistrare A în configurația DNS a furnizorului dvs. de " -"servicii de găzduire astfel încât \"www.mywebsite2.ext\" să fie " -"redirecționat către IP-ul instanței dvs. Odoo." -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" -"Creați un bloc suplimentar Nginx ``server`` în care setați ``server_name`` " -"pe care l-ați setat în câmpul :guilabel:`Website domain`." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" -"Reîncărcați și reporniți instanța dvs. Nginx pentru a utiliza noul bloc " -"``server``." +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Costuri" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "Personalizați experiența vizitatorilor" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -"Experiența clienților poate fi foarte detaliată datorită meniului " -"\\*Personalizare\\*. Toate opțiunile vizuale disponibile acolo sunt " -"specifice fiecărui site. Parcurgeți diferitele pagini pentru a le adapta " -"acestei noi audiențe. Concentrați-vă pe fluxurile de lucru și pe paginile " -"automate (finalizarea cumpărăturilor eCommerce, bloguri, evenimente, etc.), " -"deoarece numărul opțiunilor disponibile este mai mare acolo." -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" -msgstr "Publicați conținut specific pe site-ul web" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Raportare" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -"La fel ca paginile statice, orice conținut creat din față (produs, postare " -"blog, etc.) este publicat în site-ul web curent. Puteți schimba asta din " -"formularul de editare în backend și lăsați câmpul *Website* gol. Acesta va " -"permite publicarea în toate site-urile web." -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" -"Aici sunt toate obiectele pe care le puteți lega *sau la unul sau la toate " -"site-urile web*:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "Categorii de produse pentru eCommerce" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Bloguri" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "Canale de prezentare" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forumuri" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Evenimente" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Locuri de muncă" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" -"Când creați înregistrarea din backend și o publicați, de obicei un produs " -"sau un eveniment, este făcut disponibil în toate site-urile web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "Publicați o pagină în toate site-urile web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" -"O nouă pagină statică este creată și este disponibilă numai în site-ul web " -"curent. O puteți duplica în alte site-uri web din :menuselection:`Website " -"--> Configurare --> Pagini`. Pentru a face asta, lăsați câmpul *Website* " -"gol." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" -"Dacă doriți să o duplicați într-un alt site web, duplicați pagina și setați " -"noul site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" -"Când editați din nou pagina, modificarea afectează numai site-ul web curent." -" O nouă pagină este duplicată și legată de site-ul web. Pagina originală " -"este încă legată de toate site-urile web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" -"Prin gruparea paginilor după URL în managerul de pagini, găsiți rapid pagina" -" originală din spatele fiecărei pagini editate." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "Multi-companii" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" -"Fiecare site web poate fi legat de o companie specifică din sistemul dvs., " -"într-o mediu multi-companii." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" -"Cu o astfel de configurare, numai datele legate de companie apar pe site-ul " -"web (produse, locuri de muncă, evenimente, etc.)." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" -"Editorii de site-uri web pot vedea și edita numai paginile înregistrărilor " -"la care au acces, de obicei cele care aparțin companiei lor curente (și " -"subsidiarelor lor, sau companiilor copil în limba Odoo). Așa este și pentru " -"vizitatori." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" -"Dacă site-urile web sunt multi-companii, nu schimbați compania când comutați" -" site-urile web. Pentru a schimba compania și a vedea conținutul asociat, " -"folosiți selectorul de companie din meniu." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "Configurați site-ul dvs. web de comerț electronic" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" -"Comerțul electronic este o caracteristică crucială în mediu multi-site-uri " -"web. Am făcut astfel încât întregul flux să poată fi personalizat pentru a " -"se potrivi cu publicul țintă al fiecărui site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "Produse disponibile numai pe un site web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" -"Am văzut deja mai devreme cum să publicați o înregistrare specifică într-un " -"numai un site web. Veți găsi câmpul *Website* în fila Comerț electronic din " -"formularul de editare a produsului. Dacă este lăsat gol înseamnă că va fi " -"disponibil pe toate site-urile web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "Produse disponibile pe *unele* site-uri web" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" -"Pentru a face un produs disponibil pe unele site-uri web, dar nu pe toate " -"dintre ele, ar trebui să duplicați produsul pentru fiecare site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" -"Dacă aveți nevoie de o referință unică pentru a gestiona în stocul dvs., " -"trebuie să instalați *Producție* și să creați *Kit-uri* BoMs (liste de " -"materiale). Fiecare kit va lega fiecare produs \"virtual\" publicat la " -"referința principală gestionată în stocul dvs. În acest fel, orice element " -"vândut de pe site-ul dvs. va fi convertit în elementul stocabil în comanda " -"de livrare." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Liste de prețuri" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" -"Pentru a gestiona prețuri specifice fiecărui site web, puteți activa " -"*Prețuri de vânzare multiple pe produs* în setările site-ului web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" -"Lăsând câmpul gol înseamnă că faceți va funcționa pe toate site-urile web " -"dacă este selectat *Selectable*. În caz contrar, va fi disponibil numai " -"pentru operațiunile de backend ale aplicațiilor Vânzări și Punct de vânzare." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "Procesatori de plată și metode de livrare" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" -"În mod implicit, procesatorii de plată publicați și metodele de livrare sunt" -" implementate pe toate site-urile web. Ați putut deja utiliza procesatori de" -" plată specifici pe țară utilizând Geo IP prin definirea țărilor în " -"configurația lor. Acum puteți face și asta pe site-ul web completând câmpul " -"*Website*." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" -"Există o setare pentru a alege cum să gestionați conturile de client în " -"setările site-ului web. Puteți permite clienților să utilizeze un cont " -"pentru toate site-urile web sau să îi obligați să creeze un cont pentru " -"fiecare site web. Această ultimă opțiune este convenabilă, dacă trebuie să " -"pară că site-urile dvs. nu au nici legătură, pentru vizitatori." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "Sfaturi tehnice pentru personalizare" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" -"Dacă doriți să publicați obiecte personalizate pe site-ul web, aici sunt " -"câteva sfaturi pentru a face asta să funcționeze cu site-uri web multiple:" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "Harta site-ului: nu uitați domeniul în rută doar pentru publicare" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "înregistrări disponibile în harta site-ului fiecărui site web." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "Acces: ar trebui să apelați metoda" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" -"*can_access_from_current_website* în controler pentru a vă asigura că " -"vizitatorul poate vedea o înregistrare în site-ul web curent." - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" -"Căutare: când este afișată o listă de înregistrări, nu uitați să specificați" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" -"domeniul pentru a afișa numai înregistrările disponibile pentru site-ul " -"curent" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 msgid "Geo IP Installation (On-Premises Database)" @@ -5257,10 +5112,6 @@ msgstr "" "Model Data a vizualizării *Non Updatable* pentru a nu reseta fișierul după " "actualizarea sistemului." -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Raportare" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "Cum să urmăriți traficul site-ului dvs. în Google Analytics" diff --git a/locale/sl/LC_MESSAGES/finance.po b/locale/sl/LC_MESSAGES/finance.po index ca3c37cc8..775214aac 100644 --- a/locale/sl/LC_MESSAGES/finance.po +++ b/locale/sl/LC_MESSAGES/finance.po @@ -9,20 +9,20 @@ # jl2035 <jaka.luthar@gmail.com>, 2023 # matjaz k <matjaz@mentis.si>, 2023 # Boris Kodelja <boris@hbs.si>, 2023 -# Tadej Lupšina <tadej@hbs.si>, 2023 # Jasmina Macur <jasmina@hbs.si>, 2023 -# Martin Trigaux, 2023 # Matjaz Mozetic <m.mozetic@matmoz.si>, 2023 # Tomaž Jug <tomaz@editor.si>, 2023 +# Martin Trigaux, 2023 +# Tadej Lupšina <tadej@hbs.si>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Tomaž Jug <tomaz@editor.si>, 2023\n" +"Last-Translator: Tadej Lupšina <tadej@hbs.si>, 2023\n" "Language-Team: Slovenian (https://app.transifex.com/odoo/teams/41243/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -545,10 +545,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -572,7 +572,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3888,6 +3888,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterms" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5701,6 +5792,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7199,10 +7291,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7214,101 +7305,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Opomini" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Opomini" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7320,11 +7443,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7332,15 +7455,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9495,19 +9618,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9517,23 +9632,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9541,7 +9644,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9553,21 +9656,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9575,24 +9678,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9600,7 +9703,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9609,39 +9712,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9652,96 +9755,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9751,73 +9831,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10158,7 +10238,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11229,7 +11309,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11404,52 +11484,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11457,46 +11518,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Poročila" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -12004,70 +12079,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12098,7 +12173,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Ročno" @@ -13464,330 +13538,919 @@ msgstr "Stroški" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Nastavitve" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15396,10 +16059,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Poročila" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24245,7 +24904,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24545,7 +25204,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29069,7 +29728,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29292,14 +29950,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29307,7 +29965,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29381,26 +30039,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29412,7 +30080,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29422,7 +30090,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29433,36 +30101,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29474,26 +30186,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29503,21 +30215,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30320,7 +31032,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30334,183 +31046,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30518,7 +31178,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30526,44 +31186,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:98 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/sl/LC_MESSAGES/inventory_and_mrp.po b/locale/sl/LC_MESSAGES/inventory_and_mrp.po index c99bea2d5..7044231f3 100644 --- a/locale/sl/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/sl/LC_MESSAGES/inventory_and_mrp.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Tadej Lupšina <tadej@hbs.si>, 2023\n" "Language-Team: Slovenian (https://app.transifex.com/odoo/teams/41243/sl/)\n" @@ -4729,8 +4729,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4767,7 +4767,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4779,8 +4779,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4788,7 +4788,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4865,16 +4865,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4902,8 +4901,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4944,9 +4943,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/sl/LC_MESSAGES/sales.po b/locale/sl/LC_MESSAGES/sales.po index d7d6f2362..f8367cc6f 100644 --- a/locale/sl/LC_MESSAGES/sales.po +++ b/locale/sl/LC_MESSAGES/sales.po @@ -8,18 +8,18 @@ # Martin Trigaux, 2023 # Grega Vavtar <grega@hbs.si>, 2023 # Tadej Lupšina <tadej@hbs.si>, 2023 -# Matjaz Mozetic <m.mozetic@matmoz.si>, 2023 # matjaz k <matjaz@mentis.si>, 2023 # Jasmina Macur <jasmina@hbs.si>, 2023 +# Matjaz Mozetic <m.mozetic@matmoz.si>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Jasmina Macur <jasmina@hbs.si>, 2023\n" +"Last-Translator: Matjaz Mozetic <m.mozetic@matmoz.si>, 2023\n" "Language-Team: Slovenian (https://app.transifex.com/odoo/teams/41243/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,6 +78,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1627,8 +1628,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1637,9 +1639,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1666,41 +1668,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1708,14 +1700,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1726,7 +1718,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1737,37 +1729,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1777,13 +1769,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1791,27 +1783,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1825,31 +1817,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2404,93 +2396,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Analitika" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3854,21 +3863,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Računi" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3880,7 +3889,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3888,23 +3897,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3915,27 +3924,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3945,23 +3954,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3975,7 +3984,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4609,8 +4618,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/sl/LC_MESSAGES/websites.po b/locale/sl/LC_MESSAGES/websites.po index d05323f86..7611b00b8 100644 --- a/locale/sl/LC_MESSAGES/websites.po +++ b/locale/sl/LC_MESSAGES/websites.po @@ -7,18 +7,18 @@ # Tadej Lupšina <tadej@hbs.si>, 2023 # Jasmina Macur <jasmina@hbs.si>, 2023 # matjaz k <matjaz@mentis.si>, 2023 -# Martin Trigaux, 2023 # Matjaz Mozetic <m.mozetic@matmoz.si>, 2023 # Tomaž Jug <tomaz@editor.si>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Tomaž Jug <tomaz@editor.si>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Slovenian (https://app.transifex.com/odoo/teams/41243/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -487,7 +487,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -686,7 +686,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1182,6 +1182,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Analitika" @@ -1218,7 +1219,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Proizvodi" @@ -1824,11 +1824,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1839,12 +1839,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1852,15 +1852,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1868,11 +1868,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1884,15 +1884,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1904,7 +1904,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2980,435 +2980,286 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Nastavitve" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Določanje cen" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Poročanje" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogi" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Forumi" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Dogodki" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Delovno mesto" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Ceniki" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4784,10 +4635,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Poročanje" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/vi/LC_MESSAGES/finance.po b/locale/vi/LC_MESSAGES/finance.po index 02a4c6357..9aae51571 100644 --- a/locale/vi/LC_MESSAGES/finance.po +++ b/locale/vi/LC_MESSAGES/finance.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Vietnamese (https://app.transifex.com/odoo/teams/41243/vi/)\n" @@ -540,10 +540,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -567,7 +567,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -3883,6 +3883,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "Incoterm" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -5696,6 +5787,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7194,10 +7286,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7209,101 +7300,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "Báo cáo công nợ" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "Báo cáo công nợ" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7315,11 +7438,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7327,15 +7450,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9490,19 +9613,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9512,23 +9627,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9536,7 +9639,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9548,21 +9651,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9570,24 +9673,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9595,7 +9698,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9604,39 +9707,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9647,96 +9750,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9746,73 +9826,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10153,7 +10233,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11224,7 +11304,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11399,52 +11479,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11452,46 +11513,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "Báo cáo" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -11999,70 +12074,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12093,7 +12168,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "Thủ công" @@ -13459,330 +13533,919 @@ msgstr "Chi phí" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "Thiết lập" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15391,10 +16054,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "Báo cáo" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24240,7 +24899,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24540,7 +25199,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29064,7 +29723,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29287,14 +29945,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29302,7 +29960,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29376,26 +30034,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29407,7 +30075,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29417,7 +30085,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29428,36 +30096,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Tài khoản Adyen" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29469,26 +30181,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29498,21 +30210,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30315,7 +31027,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30329,183 +31041,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30513,7 +31173,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30521,44 +31181,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "Thông tin đăng nhập" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/vi/LC_MESSAGES/inventory_and_mrp.po b/locale/vi/LC_MESSAGES/inventory_and_mrp.po index 748586397..c08ce5cde 100644 --- a/locale/vi/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/vi/LC_MESSAGES/inventory_and_mrp.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Vietnamese (https://app.transifex.com/odoo/teams/41243/vi/)\n" @@ -4725,8 +4725,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4763,7 +4763,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4775,8 +4775,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4784,7 +4784,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4861,16 +4861,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4898,8 +4897,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4940,9 +4939,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/vi/LC_MESSAGES/sales.po b/locale/vi/LC_MESSAGES/sales.po index e6ecacc4e..42ff2c8f9 100644 --- a/locale/vi/LC_MESSAGES/sales.po +++ b/locale/vi/LC_MESSAGES/sales.po @@ -6,17 +6,17 @@ # Translators: # Duy BQ <duybq86@gmail.com>, 2023 # Thi Huong Nguyen, 2023 -# Martin Trigaux, 2023 # Nancy Momoland <thanh.np2502@gmail.com>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Nancy Momoland <thanh.np2502@gmail.com>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Vietnamese (https://app.transifex.com/odoo/teams/41243/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,6 +75,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1624,8 +1625,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1634,9 +1636,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1663,41 +1665,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1705,14 +1697,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1723,7 +1715,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1734,37 +1726,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1774,13 +1766,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1788,27 +1780,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1822,31 +1814,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2401,93 +2393,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "Phân tích" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3851,21 +3860,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "Hóa đơn" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3877,7 +3886,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3885,23 +3894,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3912,27 +3921,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3942,23 +3951,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3972,7 +3981,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4606,8 +4615,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/vi/LC_MESSAGES/websites.po b/locale/vi/LC_MESSAGES/websites.po index 389eb2659..27117ee92 100644 --- a/locale/vi/LC_MESSAGES/websites.po +++ b/locale/vi/LC_MESSAGES/websites.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 07:00+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Thi Huong Nguyen, 2023\n" "Language-Team: Vietnamese (https://app.transifex.com/odoo/teams/41243/vi/)\n" @@ -485,7 +485,7 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 #: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 @@ -684,7 +684,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "" @@ -1180,6 +1180,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "Phân tích" @@ -1216,7 +1217,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "Sản phẩm" @@ -1822,11 +1822,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1837,12 +1837,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1850,15 +1850,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1866,11 +1866,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1882,15 +1882,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1902,7 +1902,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2978,435 +2978,286 @@ msgstr "" msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "Thiết lập" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" +msgid "Click the :guilabel:`Create` button." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 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." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:71 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 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." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "Thêm tính năng" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." msgstr "" -#: ../../content/applications/websites/website/configuration/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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," +msgid "Records and features can be made available:" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." +msgid "Website pages" msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" +msgid "Select the website on which the page is currently published." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:113 +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 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." +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:122 +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 msgid "" -"Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, " -"don’t forget to install *GeoIP* library. See :doc:`on-premise_geo-ip-" -"installation`" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "Định giá" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." msgstr "" +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "Báo cáo" + #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "Blogs" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "Diễn đàn" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "Các sự kiện" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "Vị trí công việc" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "Bảng giá" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 @@ -4782,10 +4633,6 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "Báo cáo" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/administration.po b/locale/zh_CN/LC_MESSAGES/administration.po index 086494f59..c82aedaee 100644 --- a/locale/zh_CN/LC_MESSAGES/administration.po +++ b/locale/zh_CN/LC_MESSAGES/administration.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-15 06:38+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2023-01-13 14:30+0000\n" "Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -1446,7 +1446,7 @@ msgstr "Demo_实例不需要本地安装，只需要一个 Web 浏览器。" #: ../../content/administration/install/install.rst:59 #: ../../content/administration/maintain/domain_names.rst:166 #: ../../content/administration/maintain/domain_names.rst:236 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:31 #: ../../content/administration/upgrade/odoo_online.rst:3 msgid "Odoo Online" msgstr "Odoo云端版本" @@ -2926,7 +2926,7 @@ msgstr "目标地址是数据库的当前地址，在创建时定义（例如， #: ../../content/administration/maintain/domain_names.rst:171 #: ../../content/administration/maintain/domain_names.rst:250 -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:32 #: ../../content/administration/odoo_sh.rst:5 #: ../../content/administration/upgrade/odoo_sh.rst:3 msgid "Odoo.sh" @@ -4491,6 +4491,8 @@ msgstr "" #: ../../content/administration/maintain/odoo_online.rst:38 #: ../../content/administration/odoo_sh/getting_started/branches.rst:293 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:113 #: ../../content/administration/upgrade.rst:10 msgid "Upgrade" msgstr "升级" @@ -5000,276 +5002,344 @@ msgstr "下表是每个版本的支持状态。" msgid "**Major releases are in bold type.**" msgstr " **要版本以粗体显示。**" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:33 #: ../../content/administration/upgrade/on_premise.rst:3 msgid "On-Premise" msgstr "本地部署" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:34 msgid "Release date" msgstr "发布日期" -#: ../../content/administration/maintain/supported_versions.rst:27 +#: ../../content/administration/maintain/supported_versions.rst:35 msgid "End of support" msgstr "终止支持" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "Odoo saas~16.2" +#: ../../content/administration/maintain/supported_versions.rst:36 +msgid "Odoo saas~16.3" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:56 +#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:73 +#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:75 +#: ../../content/administration/maintain/supported_versions.rst:79 +#: ../../content/administration/maintain/supported_versions.rst:80 +#: ../../content/administration/maintain/supported_versions.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:58 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:62 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:66 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:70 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:74 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:78 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:82 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:83 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:86 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:91 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:99 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:103 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:107 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:111 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:115 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:119 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:122 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:127 msgid "|green|" msgstr "|green|" -#: ../../content/administration/maintain/supported_versions.rst:29 -#: ../../content/administration/maintain/supported_versions.rst:31 -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:38 +#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:44 #: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:59 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:50 +#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:62 #: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:68 +#: ../../content/administration/maintain/supported_versions.rst:69 +#: ../../content/administration/maintain/supported_versions.rst:92 +#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:104 +#: ../../content/administration/maintain/supported_versions.rst:105 +#: ../../content/administration/maintain/supported_versions.rst:116 +#: ../../content/administration/maintain/supported_versions.rst:117 +#: ../../content/administration/maintain/supported_versions.rst:122 +#: ../../content/administration/maintain/supported_versions.rst:123 +#: ../../content/administration/maintain/supported_versions.rst:134 +#: ../../content/administration/maintain/supported_versions.rst:135 +#: ../../content/administration/maintain/supported_versions.rst:140 +#: ../../content/administration/maintain/supported_versions.rst:146 +#: ../../content/administration/maintain/supported_versions.rst:147 +#: ../../content/administration/maintain/supported_versions.rst:152 msgid "N/A" msgstr "无" -#: ../../content/administration/maintain/supported_versions.rst:29 +#: ../../content/administration/maintain/supported_versions.rst:40 +msgid "June 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:41 +msgid "September 2023 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:42 +msgid "Odoo saas~16.2" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:46 msgid "March 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:29 -msgid "June 2023 (planned)" +#: ../../content/administration/maintain/supported_versions.rst:47 +msgid "July 2023 (planned)" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 +#: ../../content/administration/maintain/supported_versions.rst:48 msgid "Odoo saas~16.1" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "February 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:31 -msgid "April 2023" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "**Odoo 16.0**" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -#: ../../content/administration/maintain/supported_versions.rst:43 -msgid "October 2022" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:33 -msgid "October 2025 (planned)" -msgstr "" - -#: ../../content/administration/maintain/supported_versions.rst:35 -msgid "Odoo saas~15.2" -msgstr "Odoo saas~15.2" - -#: ../../content/administration/maintain/supported_versions.rst:35 -#: ../../content/administration/maintain/supported_versions.rst:37 -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:45 -#: ../../content/administration/maintain/supported_versions.rst:47 #: ../../content/administration/maintain/supported_versions.rst:49 -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:53 -#: ../../content/administration/maintain/supported_versions.rst:55 -#: ../../content/administration/maintain/supported_versions.rst:57 -#: ../../content/administration/maintain/supported_versions.rst:59 #: ../../content/administration/maintain/supported_versions.rst:61 -#: ../../content/administration/maintain/supported_versions.rst:63 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:67 +#: ../../content/administration/maintain/supported_versions.rst:85 +#: ../../content/administration/maintain/supported_versions.rst:86 +#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:97 +#: ../../content/administration/maintain/supported_versions.rst:98 +#: ../../content/administration/maintain/supported_versions.rst:99 +#: ../../content/administration/maintain/supported_versions.rst:103 +#: ../../content/administration/maintain/supported_versions.rst:109 +#: ../../content/administration/maintain/supported_versions.rst:110 +#: ../../content/administration/maintain/supported_versions.rst:111 +#: ../../content/administration/maintain/supported_versions.rst:115 +#: ../../content/administration/maintain/supported_versions.rst:121 +#: ../../content/administration/maintain/supported_versions.rst:127 +#: ../../content/administration/maintain/supported_versions.rst:128 +#: ../../content/administration/maintain/supported_versions.rst:129 +#: ../../content/administration/maintain/supported_versions.rst:133 +#: ../../content/administration/maintain/supported_versions.rst:139 +#: ../../content/administration/maintain/supported_versions.rst:141 +#: ../../content/administration/maintain/supported_versions.rst:145 +#: ../../content/administration/maintain/supported_versions.rst:151 +#: ../../content/administration/maintain/supported_versions.rst:153 msgid "|red|" msgstr "|red|" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:52 +msgid "February 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:53 +msgid "April 2023" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:54 +msgid "**Odoo 16.0**" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:58 +#: ../../content/administration/maintain/supported_versions.rst:89 +msgid "October 2022" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:59 +msgid "October 2025 (planned)" +msgstr "" + +#: ../../content/administration/maintain/supported_versions.rst:60 +msgid "Odoo saas~15.2" +msgstr "Odoo saas~15.2" + +#: ../../content/administration/maintain/supported_versions.rst:64 msgid "March 2022" msgstr "三月 2022" -#: ../../content/administration/maintain/supported_versions.rst:35 +#: ../../content/administration/maintain/supported_versions.rst:65 msgid "January 2023" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:66 msgid "Odoo saas~15.1" msgstr "Odoo saas~15.1" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:70 msgid "February 2022" msgstr "二月 2022" -#: ../../content/administration/maintain/supported_versions.rst:37 +#: ../../content/administration/maintain/supported_versions.rst:71 msgid "July 2022" msgstr "" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:72 msgid "**Odoo 15.0**" msgstr "**Odoo 15.0**" -#: ../../content/administration/maintain/supported_versions.rst:39 -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:101 msgid "October 2021" msgstr "十月 2021" -#: ../../content/administration/maintain/supported_versions.rst:39 +#: ../../content/administration/maintain/supported_versions.rst:77 msgid "October 2024 (planned)" msgstr "2024年10月（计划）" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:78 msgid "**Odoo 14.0**" msgstr "**Odoo 14.0**" -#: ../../content/administration/maintain/supported_versions.rst:41 -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:82 +#: ../../content/administration/maintain/supported_versions.rst:113 msgid "October 2020" msgstr "2020年10月" -#: ../../content/administration/maintain/supported_versions.rst:41 +#: ../../content/administration/maintain/supported_versions.rst:83 msgid "October 2023 (planned)" msgstr "2023年10月（计划）" -#: ../../content/administration/maintain/supported_versions.rst:43 +#: ../../content/administration/maintain/supported_versions.rst:84 msgid "**Odoo 13.0**" msgstr "**Odoo 13.0**" -#: ../../content/administration/maintain/supported_versions.rst:43 -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:88 +#: ../../content/administration/maintain/supported_versions.rst:131 msgid "October 2019" msgstr "2019年10月" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:90 msgid "Odoo saas~12.3" msgstr "Odoo saas~12.3" -#: ../../content/administration/maintain/supported_versions.rst:45 +#: ../../content/administration/maintain/supported_versions.rst:94 msgid "August 2019" msgstr "2019年8月" -#: ../../content/administration/maintain/supported_versions.rst:47 +#: ../../content/administration/maintain/supported_versions.rst:96 msgid "**Odoo 12.0**" msgstr "**Odoo 12.0**" -#: ../../content/administration/maintain/supported_versions.rst:47 -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:100 +#: ../../content/administration/maintain/supported_versions.rst:143 msgid "October 2018" msgstr "2018年10月" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:102 msgid "Odoo saas~11.3" msgstr "Odoo saas~11.3" -#: ../../content/administration/maintain/supported_versions.rst:49 +#: ../../content/administration/maintain/supported_versions.rst:106 msgid "April 2018" msgstr "2018年4月" -#: ../../content/administration/maintain/supported_versions.rst:51 +#: ../../content/administration/maintain/supported_versions.rst:108 msgid "**Odoo 11.0**" msgstr "**Odoo 11.0**" -#: ../../content/administration/maintain/supported_versions.rst:51 -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:112 +#: ../../content/administration/maintain/supported_versions.rst:155 msgid "October 2017" msgstr "2017年10月" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:114 msgid "Odoo 10.saas~15" msgstr "Odoo 10.saas~15" -#: ../../content/administration/maintain/supported_versions.rst:53 +#: ../../content/administration/maintain/supported_versions.rst:118 msgid "March 2017" msgstr "2017年3月" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:120 msgid "Odoo 10.saas~14" msgstr "Odoo 10.saas~14" -#: ../../content/administration/maintain/supported_versions.rst:55 +#: ../../content/administration/maintain/supported_versions.rst:124 msgid "January 2017" msgstr "2017年1月" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:126 msgid "**Odoo 10.0**" msgstr "**Odoo 10.0**" -#: ../../content/administration/maintain/supported_versions.rst:57 +#: ../../content/administration/maintain/supported_versions.rst:130 msgid "October 2016" msgstr "2016年10月" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:132 msgid "Odoo 9.saas~11" msgstr "Odoo 9.saas~11" -#: ../../content/administration/maintain/supported_versions.rst:59 +#: ../../content/administration/maintain/supported_versions.rst:136 msgid "May 2016" msgstr "2016年5月" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:138 msgid "**Odoo 9.0**" msgstr "**Odoo 9.0**" -#: ../../content/administration/maintain/supported_versions.rst:61 +#: ../../content/administration/maintain/supported_versions.rst:142 msgid "October 2015" msgstr "2015年10月" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:144 msgid "Odoo 8.saas~6" msgstr "Odoo 8.saas~6" -#: ../../content/administration/maintain/supported_versions.rst:63 +#: ../../content/administration/maintain/supported_versions.rst:148 msgid "February 2015" msgstr "2015年2月" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:150 msgid "**Odoo 8.0**" msgstr "**Odoo 8.0**" -#: ../../content/administration/maintain/supported_versions.rst:65 +#: ../../content/administration/maintain/supported_versions.rst:154 msgid "September 2014" msgstr "2014年9月" -#: ../../content/administration/maintain/supported_versions.rst:70 +#: ../../content/administration/maintain/supported_versions.rst:159 msgid "|green| Supported version" msgstr "|green| 支持的版本" -#: ../../content/administration/maintain/supported_versions.rst:72 +#: ../../content/administration/maintain/supported_versions.rst:161 msgid "|red| End-of-support" msgstr "|red| 结束支持" -#: ../../content/administration/maintain/supported_versions.rst:74 +#: ../../content/administration/maintain/supported_versions.rst:163 msgid "N/A Never released for this platform" msgstr "不适用 从未在此平台发布" -#: ../../content/administration/maintain/supported_versions.rst:76 +#: ../../content/administration/maintain/supported_versions.rst:165 msgid "🏁 Future version, not released yet" msgstr "🏁 未来版本，尚未发布" -#: ../../content/administration/maintain/supported_versions.rst:87 +#: ../../content/administration/maintain/supported_versions.rst:176 msgid "I run an older version of Odoo/OpenERP/TinyERP" msgstr "我仍在使用老版本的 Odoo/OpenERP/TinyERP" -#: ../../content/administration/maintain/supported_versions.rst:89 +#: ../../content/administration/maintain/supported_versions.rst:178 msgid "" "OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform." msgstr "OpenERP 7.0、6.1、6.0和5.0在任何平台上均不再提供支持。" -#: ../../content/administration/maintain/supported_versions.rst:91 +#: ../../content/administration/maintain/supported_versions.rst:180 msgid "" "TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform." msgstr "TinyERP 4.0、3.0、2.0和1.0在任何平台上均不再提供支持。" -#: ../../content/administration/maintain/supported_versions.rst:93 +#: ../../content/administration/maintain/supported_versions.rst:182 msgid "" "Even though we don't support older versions, you can always `upgrade from " "any version <https://upgrade.odoo.com/>`_." @@ -5889,7 +5959,7 @@ msgstr "" "您计划的操作应该是“幂等<https://stackoverflow.com/a/1077421/3332416>”_：如果它们开始的频率高于预期，则它们不得引起副作用。" #: ../../content/administration/odoo_sh/advanced/submodules.rst:6 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:110 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:170 msgid "Submodules" msgstr "子模块" @@ -6234,7 +6304,7 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:88 #: ../../content/administration/odoo_sh/getting_started/builds.rst:81 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:56 msgid "Development" msgstr "开发" @@ -6371,8 +6441,8 @@ msgid "Tabs" msgstr "页卡" #: ../../content/administration/odoo_sh/getting_started/branches.rst:155 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 msgid "History" msgstr "历史" @@ -6402,8 +6472,8 @@ msgstr "" " *connect* 按钮访问数据库。" #: ../../content/administration/odoo_sh/getting_started/branches.rst:173 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:101 msgid "Mails" msgstr "邮件" @@ -6453,7 +6523,7 @@ msgid "" msgstr "用于编辑源代码的在线集成开发环境 （IDE）。您还可以打开终端，Python控制台甚至Odoo Shell控制台。" #: ../../content/administration/odoo_sh/getting_started/branches.rst:212 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:105 msgid "Monitoring" msgstr "监控" @@ -6469,8 +6539,8 @@ msgid "" msgstr "您可以缩放、更改时间范围或在每个图表上选择特定指标。在图表上，注释可帮助您与构建（数据库导入，git推送等）的更改相关联。" #: ../../content/administration/odoo_sh/getting_started/branches.rst:225 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:93 msgid "Logs" msgstr "日志" @@ -6521,7 +6591,7 @@ msgid "" msgstr "您可以通过单击视图右上角的相应按钮来暂停日志提取。抓取会在 5 分钟后自动停止。您可以使用播放按钮重新启动它。" #: ../../content/administration/odoo_sh/getting_started/branches.rst:249 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:109 msgid "Backups" msgstr "备份" @@ -6629,9 +6699,9 @@ msgstr "" #: ../../content/administration/odoo_sh/getting_started/branches.rst:303 #: ../../content/administration/odoo_sh/getting_started/settings.rst:3 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 #: ../../content/administration/odoo_sh/getting_started/settings.rst:81 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:117 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:124 msgid "Settings" msgstr "设置" @@ -8607,83 +8677,72 @@ msgid "" "logs." msgstr "此外，他们不能使用 Webshell，也无法访问服务器日志。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:54 msgid "User" msgstr "用户" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:49 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 msgid "Admin" msgstr "管理员" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:51 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:55 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:59 #: ../../content/administration/odoo_sh/getting_started/settings.rst:61 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:67 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:69 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:71 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:73 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:75 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:77 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:81 -msgid "X" -msgstr "X" - -#: ../../content/administration/odoo_sh/getting_started/settings.rst:53 -#: ../../content/administration/odoo_sh/getting_started/settings.rst:65 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:89 msgid "1-click connect" msgstr "一键连接" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:57 #: ../../content/administration/odoo_sh/getting_started/settings.rst:69 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 msgid "Shell/SSH" msgstr "Shell/SSH" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:63 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:84 msgid "Production & Staging" msgstr "生产与舞台" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:79 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:118 +msgid "|green|\\*" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:120 #: ../../content/administration/odoo_sh/getting_started/status.rst:3 msgid "Status" msgstr "状态" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:85 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +msgid "\\* Only in staging branches" +msgstr "" + +#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 msgid "Public Access" msgstr "公共访问" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:87 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:147 msgid "Allow public access to your development builds." msgstr "允许对开发版本进行公共访问。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:92 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:152 msgid "" "If activated, this option exposes the Builds page publicly, allowing " "visitors to connect to your development builds." msgstr "如果激活，此选项将公开“生成”页，允许访问者连接到开发生成。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:95 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 msgid "" "In addition, visitors have access to the logs, shell and mails of your " "development builds." msgstr "此外，访问者还可以访问开发版本的日志、shell 和邮件。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:97 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 msgid "" "Production and staging builds are excluded, visitors can only see their " "status." msgstr "生产和过渡版本被排除在外，访问者只能看到他们的状态。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:102 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 msgid "Custom domains" msgstr "自定义域" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:104 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:164 msgid "" "To configure additional domains please refer to the corresponding branch's " ":ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`." @@ -8691,13 +8750,13 @@ msgstr "" "要配置其他域，请参阅相应分支的 ：ref：'settings 选项卡 <odoosh-gettingstarted-branches-tabs-" "settings>'。</odoosh-gettingstarted-branches-tabs-settings>" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:112 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:172 msgid "" "Configure the deploy keys for the private repositories you use as submodules" " in your branches to allow Odoo.sh to download them." msgstr "为在分支中用作子模块的私有仓库配置部署密钥，以允许 Odoo.sh 下载它们。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:116 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:176 msgid "" "These settings are required for **private repositories** only. If you are " "looking on how to set up your submodules, instructions are available in the " @@ -8707,7 +8766,7 @@ msgstr "" "仅对于“私有仓库”，这些设置是必需的。如果您正在研究如何设置子模块，请参阅本文档的章节：ref：`Submodules <odoosh-" "advanced-submodules>`。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:123 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:183 msgid "" "When a repository is private, it is not possible to publicly download its " "branches and revisions. For that reason, you need to configure a deploy key " @@ -8717,108 +8776,108 @@ msgstr "" "当存储库是私有的时，无法公开下载其分支和修订版。因此，您需要为 Odoo.sh 配置部署密钥，以便远程 Git " "服务器允许我们的平台下载此私有存储库的修订版。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:128 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:188 msgid "" "To configure the deploy key for a private repository, proceed as follows:" msgstr "要为私有存储库配置部署密钥，请按以下步骤操作：" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:130 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:190 msgid "" "in the input, paste the SSH URL of your private sub-repository and click on " "*Add*," msgstr "在输入中，粘贴私有子存储库的 SSH URL，然后单击“*添加”，" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:132 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:192 msgid "e.g. *git@github.com:USERNAME/REPOSITORY.git*" msgstr "例如 *git@github.com：USERNAME/REPOSITORY.git*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:133 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:193 msgid "" "it can be another Git server than Github, such as Bitbucket, Gitlab or even " "your own self-hosted server" msgstr "它可以是Github以外的另一个Git服务器，例如Bitbucket，Gitlab甚至您自己的自托管服务器" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:136 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 msgid "copy the public key," msgstr "复制公钥，" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:138 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:198 msgid "it should look like *ssh-rsa some...random...characters...here...==*" msgstr "它应该看起来像*ssh-rsa一些...随机。。。字符。。。这里...==*" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:140 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:200 msgid "" "in the settings of the private sub-repository, add the public key amongst " "the deploy keys." msgstr "在私有子存储库的设置中，在部署密钥之间添加公钥。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:142 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:202 msgid "" "Github.com: :menuselection:`Settings --> Deploy keys --> Add deploy key`" msgstr "" "Github.com： ：menuselection：`Settings --> Deploy key --> Add deploy key`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:143 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:203 msgid "Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`" msgstr "Bitbucket.com： ：菜单选择：“设置 --> 访问键 --> 添加键`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:144 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:204 msgid "Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`" msgstr "Gitlab.com： ：菜单选择：`设置 -->存储库 -->部署密钥`" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:145 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:205 msgid "" "Self-hosted: append the key to the git user’s authorized_keys file in its " ".ssh directory" msgstr "自托管：将密钥附加到 git 用户的 authorized_keys 文件在其 .ssh 目录中" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:148 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:208 msgid "Storage Size" msgstr "存储大小" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:150 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:210 msgid "This section shows the storage size used by your project." msgstr "本部分显示项目使用的存储大小。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:155 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:215 msgid "Storage size is computed as follows:" msgstr "存储大小的计算方法如下：" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:157 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:217 msgid "the size of the PostgreSQL database" msgstr "PostgreSQL 数据库的大小" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:159 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:219 msgid "" "the size of the disk files available in your container: database filestore, " "sessions storage directory..." msgstr "容器中可用磁盘文件的大小：数据库文件存储、会话存储目录..." -#: ../../content/administration/odoo_sh/getting_started/settings.rst:162 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:222 msgid "" "In case you want to analyze disk usage, you can run the tool `ncdu " "<https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell." msgstr "" "如果要分析磁盘使用情况，可以在 Web Shell 中运行工具“ncdu <https://dev.yorhel.nl/ncdu/man>”。。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:165 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:225 msgid "" "Should your production database size grow to exceed what's provisioned in " "your subscription, it will automatically be synchronized with it." msgstr "如果生产数据库大小增长到超过订阅中预配的大小，它将自动与订阅同步。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:169 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:229 msgid "Database Workers" msgstr "数据库工作线程" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:171 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:231 msgid "" "Additional database workers can be configured here. More workers help " "increase the load your production database is able to handle. If you add " "more, it will automatically be synchronized with your subscription." msgstr "可以在此处配置其他数据库工作线程。更多的工作人员有助于增加生产数据库能够处理的负载。如果添加更多，它将自动与你的订阅同步。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:179 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:239 msgid "" "Adding more workers will not magically solve all performance issues. It only" " allows the server to handle more connections at the same time. If some " @@ -8828,22 +8887,22 @@ msgid "" msgstr "" "增加更多的工作人员并不能神奇地解决所有性能问题。它只允许服务器同时处理更多连接。如果某些操作异常缓慢，则很可能是代码有问题，如果不是由于您自己的自定义，则可以打开工单“这里<https://www.odoo.com/help>”_。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:185 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:245 msgid "Staging Branches" msgstr "暂存分支" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:187 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:247 msgid "" "Additional staging branches allow you to develop and test more features at " "the same time. If you add more, it will automatically be synchronized with " "your subscription." msgstr "其他暂存分支允许您同时开发和测试更多功能。如果添加更多，它将自动与你的订阅同步。" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:194 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:254 msgid "Activation" msgstr "启用" -#: ../../content/administration/odoo_sh/getting_started/settings.rst:196 +#: ../../content/administration/odoo_sh/getting_started/settings.rst:256 msgid "" "Shows the status of the project's activation. You can change the project's " "activation code if needed." diff --git a/locale/zh_CN/LC_MESSAGES/finance.po b/locale/zh_CN/LC_MESSAGES/finance.po index d130126ff..c412edd80 100644 --- a/locale/zh_CN/LC_MESSAGES/finance.po +++ b/locale/zh_CN/LC_MESSAGES/finance.po @@ -23,29 +23,29 @@ # zpq001 <zpq001@live.com>, 2022 # mrshelly <mrshelly@hotmail.com>, 2022 # Connie Xiao <connie.xiao@elico-corp.com>, 2022 -# e2f <projects@e2f.com>, 2022 # Benson <Benson.Dr@Gmail.com>, 2022 +# e2f <projects@e2f.com>, 2022 # 苏州远鼎 <tiexinliu@126.com>, 2022 # Mandy Choy <mnc@odoo.com>, 2023 # keecome <7017511@qq.com>, 2023 # Gary Wei <Gary.wei@elico-corp.com>, 2023 # 稀饭~~ <wangwhai@qq.com>, 2023 -# Datasource International <Hennessy@datasourcegroup.com>, 2023 # Shaw J <arronnjxj@gmail.com>, 2023 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2023 -# Jeffery CHEN <jeffery9@gmail.com>, 2023 # Raymond Yu <cl_yu@hotmail.com>, 2023 -# Martin Trigaux, 2023 # Emily Jia <eji@odoo.com>, 2023 +# Martin Trigaux, 2023 +# Datasource International <Hennessy@datasourcegroup.com>, 2023 +# Jeffery CHEN <jeffery9@gmail.com>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" -"Last-Translator: Emily Jia <eji@odoo.com>, 2023\n" +"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -572,10 +572,10 @@ msgstr "要编辑现有银行日记账，转到:menuselection:`会计-->配置-- #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -599,7 +599,7 @@ msgstr "要编辑现有银行日记账，转到:menuselection:`会计-->配置-- #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -4014,6 +4014,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "国际贸易术语" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "开票流程" @@ -5868,6 +5959,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7395,12 +7487,10 @@ msgstr "开票跟进" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" -"如果客户付款逾期，可以向客户发送跟进信息。Odoo帮助您识别逾期付款，您可以使用**跟进动作**计划、发送提醒信息，根据逾期天数自动触发一个或多个跟进行动。您可以通过电子邮件、帖子或SMS短信等方式发送跟进信息。" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 msgid "" @@ -7412,105 +7502,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" -"要配置:guilabel:`跟进动作`，请转到:menuselection:`会计-->配置-->跟进等级`。在默认情况下，有多个跟进动作可用，您可以根据需要自定义或创建、以像触发以下跟进动作：" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 +msgid "" +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." -msgstr "还可以通过在特定:guilabel:`跟进动作`中启用:guilabel:`自动执行`选项，以自动发送提醒。" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 -msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." -msgstr "要在到达实际到期日期之前发送提醒，请将到期天数设置为负数。" +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." +msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 +msgid "" +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 +msgid "" +"Set a negative number of days to send a reminder before the actual due date." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:43 msgid "Follow-up reports" msgstr "催款报告" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." -msgstr "要查看需要跟进的逾期开票，转到:menuselection:`会计-->客户-->跟进报告`，您可以识别所有逾期未付开票的客户。" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 -msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -"打开一个客户后，您会看到他的所有未付开票（无论是否逾期）。逾期开票的到期日显示为红色。在:guilabel:`已排除`列选择尚未逾期的开票，以避免发送提醒信息。" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -"您可以决定提醒客户的方式，可以选择:guilabel:`打印信`、:guilabel:`发送电子邮件`、:guilabel:`邮寄`、:guilabel:`发送SMS短信`。然后，点击:guilabel:`完成`，查看需要关注的下一跟进操作。" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." -msgstr "使用开票或联系人表单中的联系人信息发送提醒信息。" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "发送提醒信息时，会记录在开票的聊天窗口中。" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -"如果目前尚不需发送提醒信息，可以指定:guilabel:`下一提醒日期`，并点击:guilabel:`之后提醒`。根据对账单中设置的下一提醒日期，您将收到报告。" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." -msgstr "在启动跟进流程之前，请核对您的银行对账单，以避免向已付款客户发送提醒信息。" +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." +msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "债务人的信任度" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7524,11 +7642,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "选择付款人信任级别" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "批量发送提醒" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7537,15 +7655,15 @@ msgid "" msgstr "" "您可以在:guilabel:`跟进报告`页面批量发送提醒邮件，选择您要处理的所有报告，点击单击:guilabel:`动作`齿轮图标，然后选择:guilabel:`处理跟进`。" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9728,19 +9846,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9750,23 +9860,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9774,7 +9872,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9786,21 +9884,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "产品配置" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "商品代码" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9808,24 +9906,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9833,7 +9931,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9842,39 +9940,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9885,96 +9983,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9984,73 +10059,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10391,7 +10466,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11519,7 +11594,7 @@ msgid "" msgstr "使用客户、报价单和开票中的:guilabel:`Avalara代码`字段，交叉引用Odoo和Avatax中的数据。" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr ":doc:`fiscal_positions`" @@ -11706,108 +11781,96 @@ msgstr "欧盟境内远程销售" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -"**欧盟境内的远程销售**包括卖方在不与客户会面的情况下，向另一个欧盟成员国的个人消费者（B2C）跨境销售商品或服务。组织须确保远程销售产生的增值税支付给交付货物或服务的欧盟成员国。" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." -msgstr "即使您的组织位于欧盟以外，情况仍然如此。" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" -"**一站式申报服务（OSS）**是一个线上门户网站，企业可以为欧盟境内远程销售注册一站式申报。所有欧盟成员国都集成了线上一站式申报服务门户网站。" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" -"`欧盟委员会：一站式申报服务|税务和关税联盟<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." -msgstr "" -"转到：menuselection：'会计/开票 -->设置 -->税费'，然后启用 **欧盟共同体内远程销售**（如果您在 2021 年 7 月 1 " -"日之前创建了数据库，则启用 **欧盟数字商品增值税**）和 *保存*。" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "Odoo会计应用程序设置中的欧盟境内远程销售功能" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -"如果您在**2021年7月1日**之前已经安装了该功能，或者在会计应用程序设计中激活了**欧盟数字商品增值税**功能，请转到:ref:`upgrade " -"the module <general/upgrade>` `l10n_eu_service`。然后，确保:ref:`refresh the tax " -"mapping <eu_distance_selling/refresh-mapping>`。" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "财政状况和税收" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "启用后，该功能将根据您公司所在国家，自动创建各欧盟成员国要求的所有必要税项和财政状况。" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "强烈建议您在使用前检查拟议映射是否适合您销售的产品或服务。" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" -msgstr "刷新税项映射" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" +msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." -msgstr "无论何时添加或修改税项，您都可以自动更新财政状况。" +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." +msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "报告" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." -msgstr "转到:menuselection:`会计/开票-->设置-->税项-->欧盟境内远程销售`，点击*刷新税项映射*按钮。" +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" +msgstr "" +"`欧盟委员会：一站式申报服务|税务和关税联盟<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 msgid "Fiscal positions (tax and account mapping)" @@ -12343,18 +12406,18 @@ msgid "" msgstr "" "还有另一种意外情况。例如，您根据5折促销计划销售了某产品，如果产品的税率为7%，TaxCloud集成后计算的税率显示为3.5%，因为折扣包含在发送给TaxCloud的价格中。然而，在Odoo中，折扣处理情况完全不同，但税率计算结果是正确的。事实上，对全价征收3.5%的税，就相当于对半价征收7%的税，但从用户角度来看，这可能令人不解。" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" -msgstr "VIES 增值税号验证" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" +msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "**VAT信息交换系统** - 简称 **VIES** - 是欧盟委员会提供的工具，可让您检查在欧盟注册的公司的增值税号的有效性。" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " @@ -12362,7 +12425,7 @@ msgid "" msgstr "" "保存联系人时，Odoo提供了 **验证增值税号** 的功能。 这可以帮助您确保您的联系人在不离开Odoo界面的情况下为您提供了有效的增值税号." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " @@ -12371,45 +12434,45 @@ msgstr "" "要启用此功能，请转到 :menuselection:`会计--> 设置 --> 设定 --> 税收`，启用 **验证增值税号** 功能，然后单击 " "*保存*." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "在Odoo会计应用程序中启用“验证增值税号”" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "增值税号码验证" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "每当您创建或修改联系人时，请务必填写 **国家/地区** 和 **增值税** 字段。" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "在点击*保存*前，填写带有所在国家和增值税号的联系人表单" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "当您单击 *保存* 时，Odoo将运行VIES增值税号检查，如果增值税号无效，则会显示一条错误通知。" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "增值税号无效时，Odoo显示错误信息，而非保存" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "该工具可检查增值税号的有效性，但不检查其他字段的有效性." -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12441,7 +12504,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "手工" @@ -13848,354 +13910,920 @@ msgstr "费用" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." -msgstr "**Odoo费用报销**应用程序简化了费用管理程序。员工可以提交费用报销申请；管理者可以批准费用报销；会计师可以记录并处理付款。" +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." +msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" -msgstr "配置报销类型" - -#: ../../content/applications/finance/expenses.rst:16 -msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -"追踪费用的第一步是从 *配置* " -"菜单中配置公司允许的费用类型（在Odoo中作为产品管理）。当特定费用以固定价格报销时，在产品上设置成本。否则，将成本保存为0.0，员工将报告每项费用的实际成本。" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" -msgstr "示例如下：" +#: ../../content/applications/finance/expenses.rst:17 +msgid "" +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." +msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "餐馆：" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "成本：0.00（工单费用将记录在每笔费用上）" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "私车旅行：" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" -msgstr "成本：0.30（公司为每英里报销固定价格）" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." +msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "酒店：" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "其他：" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "成本：0.0" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -"请勿忘记针对每个报销费用类别设置费用税（及科目，如你使用Odoo会计应用程序）。使用含税价格 " -"配置税收一般是很好的做法，参见:ref:`价格含税<taxes/included-in-price>` " -"。这样，员工报告的费用已包含税收，这通常是期望的做法。" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" -"*销售*应用程序允许您指定支出类型的计量单位（单位、里程、夜晚等）。转到:menuselection:`销售-->配置-->设置`，勾选*某些产品可能以不同度量单位（高级）销售/购买*。" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" -msgstr "如何记录报销费用" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." +msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." -msgstr "作为员工（用户访问权限为员工），你可从 :menuselection:`我的费用 --> 需提交的费用`记录费用。" +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." +msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." -msgstr "选择相关产品，输入你支付的总金额（数量 = 1）或单位价格（如数量可计算，例如，酒店晚数）." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." +msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "输入费用日期." - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." -msgstr "选择你自己支付账单（并希望报销）或是公司直接支付（例如，如你使用公司信用卡）." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." +msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "设置账单参考编号，根据要求添加说明并从备忘录添加收据照片/扫描件。这将有助于经理和会计验证." - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "从邮件一键点击" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" -msgstr "员工通过电子邮件即可记录费用。添加收据截图并通过邮件发送，或简单转发账单即可！" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." +msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -"只需在 :menuselection:`费用 --> 配置 --> 设置`设置邮件别名（例如，*费用* " -"@mycompany.odoo.com）。为了安全起见，只接受经过认证的员工邮件（员工详情表中的 *工作邮件* ）。" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -"如果邮件主题在括号内写明产品的内部参考名称（例如，Ref001 食品 100€ " -"），系统自动设置报销产品。还可在邮件主题中键入费用金额，将其设置在报销中." -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "如何向经理提交报销" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -"如你已准备好向经理提交报销（例如，在出差结束后或每月一次），前往菜单 :menuselection:`我的费用 --> " -"需提交的费用`。从列表视图中选择所有费用并点击 :menuselection:`操作 --> " -"向经理提交`。保存新创建的费用报告（即费用组），并等待经理审批." -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." -msgstr "你也可在费用表单视图中通过 *向经理提交* ，逐一提交报销." - -#: ../../content/applications/finance/expenses.rst:111 -msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." -msgstr "如需查看所有已提交的费用报销报告 :menuselection:`报销 --> 我的费用 --> 费用报告`." - -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "如何审批报销费用" - -#: ../../content/applications/finance/expenses.rst:118 -msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:95 +msgid "" +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:97 +msgid "" +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" -"HR和团队经理从顶部菜单 :menuselection:`审批 --> 待审批的费用报告`即可查看所有费用报告概览。这类用户必须至少拥有 *报销* " -"应用程序的 *管理人员* 访问权限." #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." -msgstr "利用集成的沟通工具，他们可以审核费用报告，批准或拒绝，并提供反馈." - -#: ../../content/applications/finance/expenses.rst:131 -msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." -msgstr "作为团队经理，你可轻松查找团队成员的费用报告。你必须在这些员工的详情表单中被设置为经理." - -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "如何在会计应用中过账报销" - -#: ../../content/applications/finance/expenses.rst:141 -msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:130 +msgid "" +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:132 +msgid "" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" -"在经理批准报销报告后，会计部门前往 :menuselection:`费用 --> 会计 --> 需过账的报销报告`并检查会计、产品和税收。他们可点击 " -"*日记账分录过账* ，把相关的日记账分录过账到你的帐簿上。要进行此项操作，用户必须拥有以下访问权限：" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "会计：会计或顾问" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "报销费用：经理" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -"如要进行费用过账，必须为员工设置 *家庭地址* 。如在过账时收到相关的阻止消息，点击员工，进入 *个人信息* " -"选项卡并在地址簿中选择/创建员工的联系人。如对方使用Odoo，则已自动创建联系人." -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" -msgstr "如何为员工报销" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." +msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" -"你可前往 :menuselection:`费用 --> 会计 --> 需支付的费用报告`，查看所有费用报告。如要记录付款或用支票支付，点击 *登记付款*" -" ." - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" -msgstr "查看如何在Odoo中轻松管理付款流程：" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "如何向客户重开费用开票" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." -msgstr "如果你追踪到客户项目的费用，可自动对客户进行收费." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." +msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "解释 :" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "会计：会计或顾问" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "报销费用：经理" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "向客户重新开具费用开票" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "设置" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "在报销中启用 **客户开单** 设置" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" -msgstr "进入产品配置菜单并对所有报销类型设置开单方法：" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." +msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" -msgstr "订购数量：根据订购数量开具费用开票" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." +msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" -msgstr "交货数量：根据费用数量开具费用开票" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." +msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." -msgstr "按成本：按实际成本开具费用报销开票." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" +msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." -msgstr "按销售价格：按销售订单上设定的固定售价开具费用报销开票." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." +msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "创建订单" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." -msgstr "作为销售人员，针对向客户交付的服务创建并确认销售订单。如你在订单中未添加任何报销费用，在会计过账后将自动添加." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." +msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." -msgstr "将费用报销链接到销售订单." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" +msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "报销提交、验证和过账" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." -msgstr "作为经理，确保在审批报销费用报告的每个报销行都设置了分析科目。如果缺少，单击行添加。员工在提交时也可以设置." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." +msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." -msgstr "作为会计，处理日记账分录过账." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." +msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "开票费用" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -"现在，你可以为订单开具开票。前往 :menuselection:`销售 --> 开具开票 --> " -"销售`，即可开具开票。费用已自动添加到订单行。这类项目用蓝色显示（即开具开票）." -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." -msgstr "（即开具开票）." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." +msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 msgid "Fiscal localizations" @@ -15815,10 +16443,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "报告" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -25513,12 +26137,8 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" -"选择PAC，购买印章。目前，Odoo中的墨西哥地点与以下PAC合作：`Solución Factible " -"<https://solucionfactible.com/>`_、`Quadrum (formerly Finkok) " -"<https://cfdiquadrum.com.mx/index.html>`_ 和`SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_。" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 msgid "" @@ -25836,12 +26456,8 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" -"请记住，在开始从Odoo创建开票之前，您必须直接向您选择的PAC注册。我们提供了以下 PAC：`Quadrum " -"<https://cfdiquadrum.com.mx/index.html>`_、`Solución Factible " -"<https://solucionfactible.com/>`_ 和 `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_。" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 msgid "" @@ -30629,7 +31245,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "凭据选项卡" @@ -30858,14 +31473,14 @@ msgstr "`Adyen <https://www.adyen.com/>`_是一家荷兰公司，提供多种在 #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -30873,7 +31488,7 @@ msgstr ":ref:`payment_providers/add_new`" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -30948,16 +31563,25 @@ msgstr "API密钥和客户端密钥" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -"要检索API密钥和客户端密钥，请登录您的Adyen账户，转到:menuselection:`开发人员-->API凭证`。-如果您有API用户，请打开它。-如果您没有API用户，点击**新建凭证**，转到:menuselection:`服务器设置-->认证`，复制或生成**API密钥**。复制API密钥时应格外小心，因为如果不生成新密钥，将无法再次获取密钥。" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " @@ -30966,11 +31590,11 @@ msgstr "" "转到:menuselection:`客户端设置-->谁`，输入或生成**客户端密钥**，在此处，您可以 :ref:`allow payments to " "be made from your website <adyen/allowed_origins>`。" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "HMAC密钥" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -30983,7 +31607,7 @@ msgstr "" msgid "Configure a webhook." msgstr "配置反向API。" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -30995,7 +31619,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "输入通知URL。" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -31006,39 +31630,80 @@ msgstr "转到:menuselection:`安全-->HMAC密钥-->创建`。复制密钥时应 msgid "Generate a HMAC key and save it." msgstr "创建并保存HMAC密钥。" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "须保存反向API，以完成创建。" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "URL" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 -msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +msgid "API URLs" msgstr "" -"要检索URL，请登录您的Adyen账户，转到:menuselection:`开发人员-->API " -"URL`，选择:guilabel:`经典经常性API`旁列出的URL作为:guilabel:`经常性API " -"URL`，选择:guilabel:`结账API`旁的URL作为:guilabel:`结账API URL`。" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." -msgstr "为不同的API获取链接。" +#: ../../content/applications/finance/payment_providers/adyen.rst:96 +msgid "" +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" +msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Adyen帐户" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "允许特定来源付款" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -31051,19 +31716,19 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "允许从特定域发起的付款。" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "暂挂信用卡" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "Adyen允许您手动捕获金额，而非立即捕获金额。" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " @@ -31072,7 +31737,7 @@ msgstr "" "要进行设置，请在Odoo中启用**手动捕获金额**选项，参见:ref:`payment providers documentation " "<payment_providers/features/manual_capture>`。" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -31082,7 +31747,7 @@ msgstr "然后，打开您的Adyen商户账户，转到:menuselection:`账户--> msgid "Capture Delay settings in Adyen" msgstr "Adyen中的捕获延迟设置" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" @@ -31090,14 +31755,14 @@ msgid "" msgstr "" "如果您将Odoo配置为手动捕获金额，请确保将Adyen中的**捕获延迟**设置为**手动**，否则，在Odoo中，交易将在授权状态下被阻止。" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "Odoo不支持捕获部分金额。请注意，如果您从Adyen界面捕获部分金额，Odoo会将其管理为全额捕获。" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -31976,7 +32641,7 @@ msgstr "" "要允许您的客户保存信用卡凭证，以供之后使用，转到:menuselection:`配置-->别名-->我的别名信息`，在该选项卡中，您可以配置用户如何保存信用卡详细信息、信息保存时间、是否显示保存信用卡信息复选框等。" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "在Odoo上设置" @@ -31992,197 +32657,131 @@ msgstr "" " portal <ogone/ogone>`中配置的内容填写其他字段。" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" -"`Paypal " -"<https://www.paypal.com/>`_在全球可用，极受欢迎，不收取任何订阅费，账户创建程序简单易操作。因此，我们推荐Odoo初始客户使用Paypal。Paypal是一个无缝流程，客户可以通过Paypal网站注册付款。" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" -msgstr "Odoo需要您的**API凭证**与您的PayPal账户连接，包括：" - -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." -msgstr "**电子邮箱地址**：您登录Paypal所用的邮箱地址。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:22 -msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." -msgstr "**PDT身份令牌**：用于验证交易真实性的密钥。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:23 -msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." -msgstr "**使用IPN**：是否使用即时付款通知。已检查，无需更改。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:26 -msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." -msgstr "您可以从Paypal账户复制凭证，并粘贴至**凭证**选项卡下的相关字段" - -#: ../../content/applications/finance/payment_providers/paypal.rst:30 -msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." -msgstr "" -"要设置**PDT标识令牌**，转到:ref:`developer mode <developer-" -"mode>`，并根据以下配置步骤:ref:`paypal/enable-pdt`，检索令牌。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:34 -msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." -msgstr "" -"如果您使用:ref:`Paypal Sandbox account " -"<paypal/testing>`测试Paypal，请将**状态**更改为*测试模式*。建议在Odoo测试数据库而非您的主数据库执行此操作。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 -msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "您可以向使用Paypal付款的客户收取额外费用，以冲抵Paypal向您收取的手续费。转到Paypal后，顾客将看到针对订单收取的额外费用。" +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" +msgstr "自动返回" -#: ../../content/applications/finance/payment_providers/paypal.rst:45 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:48 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "您可以参考`Paypal费用<https://www.paypal.com/webapps/mpp/paypal-fees>`_设置费用。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -"`欧盟贸易商 <https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" -"payments/ index_en.htm>`_不允许因使用信用卡支付而收取额外费用。" -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "Paypal中的设置" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "首先，设置您的Paypal账户，以创建与Odoo之间的无缝客户体验。" +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." +msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:59 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "支付数据传输(PDT)" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." -msgstr "登录您的PayPal账户，打开账户设置，转到:menuselection:`账户菜单-->账户设置-->网站付款`。" +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:47 +msgid "" +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" +msgstr "即时付款通知(IPN)" + +#: ../../content/applications/finance/payment_providers/paypal.rst:56 +msgid "" +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" -msgstr " 启用自动返回" +msgid "PayPal Account Optional" +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." -msgstr "付款处理完毕后，*自动返回*功能会自动将客户转到Odoo。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -"在*网站付款*设置页面，转到:menuselection:`网站首选项-->更新-->自动返回网站付款`，然后选择**开启**。在**返回URL**字段中输入您的Odoo数据库地址（例如`https://yourcompany.odoo.com`)。" -#: ../../content/applications/finance/payment_providers/paypal.rst:73 -msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." -msgstr "任何URL都可以。Odoo只需要启用该设置，因为使用的是另一个URL。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "启用支付数据传输（PDT）" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "启用*支付数据传输*功能，以便即时接收付款确认。此功能还向客户显示付款状态，并验证付款的真实性。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" -"在*网站付款*设置页面，转到:menuselection:`网站首选项-->更新-->付款数据传输`，然后选择**开启**。保存更改后，PayPal立即显示您的**PDT身份令牌**。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "Paypal账户可选项" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "我们建议你在客户付款时不要提示他们登录Paypal账户。允许他们用借记卡/信用卡支付，否则你可能失去某些业务。确保启用这项设置。" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 +#: ../../content/applications/finance/payment_providers/paypal.rst:71 msgid "Payment Messages Format" msgstr "支付信息格式" -#: ../../content/applications/finance/payment_providers/paypal.rst:98 +#: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -"如果您使用重音字符（或主要拉丁字符以外的任何其他字符）作为客户名称或地址，则**须**配置Odoo向Paypal发送的付款请求的编码格式，否则，部分交易会因无通知而失败。" -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -"要进行此配置，转到`your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-" -"encoding>`_，点击*更多选项*，将2个默认编码格式设置为**UTF-8**。" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "你的Paypal账户已就绪！" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -32194,7 +32793,7 @@ msgstr "" "standard/integration-guide/ encryptedwebpayments#encrypted-website-payments-" "ewp>`_。" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -32205,34 +32804,104 @@ msgstr "" "<https://sandbox.paypal.com/cgi-bin/customerprofileweb?cmd=_profile-" "language-encoding>`_配置测试环境下的编码格式。" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" -msgstr "测试环境" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "授权认证" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:98 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." -msgstr "您可以在Odoo中使用Paypal沙盒账户测试整个支付流程。" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 +msgid "" +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." +msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" -msgstr "" -"使用您的凭证登录`Paypal Developer Site " -"<https://developer.paypal.com/>`_，凭证创建以下2个沙盒账户：" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." +msgstr "您可以参考`Paypal费用<https://www.paypal.com/webapps/mpp/paypal-fees>`_设置费用。" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "测试环境" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -"企业账户（用作商户，例如，`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_）。" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." @@ -32240,16 +32909,17 @@ msgstr "" "默认个人账户（用作客户，例如，`pp.merch01-buyer@example.com " "<mailto:pp.merch01-buyer@example.com>`_）。" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -"使用商户账户登录Paypal沙盒，并按相同的配置指令进行操作。在Odoo中输入您的沙盒凭证，并确保Paypal设置为*测试模式*。建议在Odoo测试数据库而非您的主数据库上执行此操作。" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "用沙盒个人账号从Odoo中运行一笔测试交易。" diff --git a/locale/zh_CN/LC_MESSAGES/inventory_and_mrp.po b/locale/zh_CN/LC_MESSAGES/inventory_and_mrp.po index 281480975..1d5d30ebf 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/zh_CN/LC_MESSAGES/inventory_and_mrp.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -4800,8 +4800,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4838,7 +4838,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4850,8 +4850,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4859,7 +4859,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4936,16 +4936,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4973,8 +4972,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -5015,9 +5014,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 79e5510b2..b948b91d5 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -7,7 +7,6 @@ # liAnGjiA <liangjia@qq.com>, 2022 # John An <johnxan@163.com>, 2022 # Miao Zhou <zhoumiao_nuaa@outlook.com>, 2022 -# Kenny Yang <biganglerau@gmail.com>, 2022 # fausthuang, 2022 # mrshelly <mrshelly@hotmail.com>, 2022 # 黎伟杰 <674416404@qq.com>, 2022 @@ -22,17 +21,17 @@ # Jeffery CHEN <jeffery9@gmail.com>, 2023 # Emily Jia <eji@odoo.com>, 2023 # scott lai, 2023 -# Martin Trigaux, 2023 # Raymond Yu <cl_yu@hotmail.com>, 2023 +# Martin Trigaux, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Raymond Yu <cl_yu@hotmail.com>, 2023\n" +"Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,6 +91,7 @@ msgstr "你可从CRM设置启用这一模式。它默认适用于你的所有销 #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1675,8 +1675,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1685,9 +1686,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1714,41 +1715,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" -msgstr "注册客户" +msgid "Set customers" +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "从会话界面，使用客户按钮。" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." -msgstr "通过这个按钮创建新客户。" +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." +msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "你需要填写客户信息表。" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "完成后，点击保存按钮。然后，你在未来的交易中就可以选择该客户了。" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1756,14 +1747,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1774,7 +1765,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1785,37 +1776,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "退货和退款" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1825,13 +1816,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1839,27 +1830,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1873,31 +1864,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2454,94 +2445,111 @@ msgid ":doc:`epos_ssc`" msgstr ":doc:`epos_ssc`" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" -msgstr "用雇员身份登陆" +msgid "Multi-employee management" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." -msgstr "通过*POS*应用程序，你可管理多个收银员。这项功能可追踪谁在工作，每位收银员每个班次的时间和收银金额。" +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." -msgstr "在Odoo中切换收银员有三种方法：*选择收银员*、*输入PIN码*或*扫描条码*。" +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." -msgstr "如要使用管理多个收银员功能，你必须有多位员工（至少两位）。" +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" -msgstr "设置员工登录" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." -msgstr "如要启用本功能，进入*PoS设置*并在*PoS表单*中勾选员工登录。然后，添加有收银机权限的员工。" +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." -msgstr "现在，你可以很容易地切换成出纳员身份" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "切换不需要识别码" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." -msgstr "切换收银员的最简单方法是无需代码，直接切换。为此，点击PoS界面中的收银员姓名。" +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." -msgstr "现在，你只需要在你的名字上点击" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "用识别码切换至出纳" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." -msgstr "你可为每位收银员设置pin码。如要设置pin码，前往*HR设置选项卡*的员工表单并添加安全PIN码。" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" +msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "现在，在切换收银员时，必须输入PIN码。" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "通过条码切换收银员" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." -msgstr "你可要求员工用自己的徽章登录。为此，在添加PIN码的同一位置设置条码。打印徽章，之后，收银员将切换为该员工。" +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "查找谁是收银员" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." -msgstr "在关闭*PoS会话*后，你可整体查看每位收银员的销售额。为此，你需进入订单菜单。" +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." +msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." -msgstr "现在，打开订单，即可看到已售出产品的摘要。" +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "分析" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." +msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 msgid "Payment methods" @@ -3946,21 +3954,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "发票" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3972,7 +3980,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3980,23 +3988,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -4007,27 +4015,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "检索开票" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -4037,23 +4045,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -4067,7 +4075,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4705,8 +4713,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/zh_CN/LC_MESSAGES/websites.po b/locale/zh_CN/LC_MESSAGES/websites.po index 87e03c3cd..e39c64417 100644 --- a/locale/zh_CN/LC_MESSAGES/websites.po +++ b/locale/zh_CN/LC_MESSAGES/websites.po @@ -5,7 +5,6 @@ # # Translators: # 黎伟杰 <674416404@qq.com>, 2022 -# fausthuang, 2022 # Xia Fajin <xia.fajin@elico-corp.com>, 2022 # 思昀 邹 <1025772003@qq.com>, 2022 # liAnGjiA <liangjia@qq.com>, 2022 @@ -26,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-13 05:55+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -499,8 +498,9 @@ msgid ":doc:`../checkout_payment_shipping/checkout`" msgstr "" #: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:93 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 #: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 #: ../../content/applications/websites/website/reporting/link_tracker.rst:10 msgid "Configuration" msgstr "配置" @@ -697,7 +697,7 @@ msgid "eCommerce management" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 -#: ../../content/applications/websites/website/configuration/multi_website.rst:288 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 msgid "Customer accounts" msgstr "客户账户" @@ -1193,6 +1193,7 @@ msgid "" msgstr "" #: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 msgid "Analytics" msgstr "分析" @@ -1229,7 +1230,6 @@ msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -#: ../../content/applications/websites/website/configuration/multi_website.rst:166 msgid "Products" msgstr "产品" @@ -1726,24 +1726,23 @@ msgid "" "To add a tax on a product, you can either set a tax in the " ":guilabel:`Customer Taxes` field of the **product template** or use " ":doc:`fiscal positions " -"</applications/finance/accounting/taxation/taxes/fiscal_positions>`." +"</applications/finance/accounting/taxes/fiscal_positions>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxes`" +msgid ":doc:`/applications/finance/accounting/taxes`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/avatax`" +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/taxcloud`" +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 -msgid "" -":doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`" +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 @@ -1793,7 +1792,7 @@ msgid "Tax type displayed on the product page" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 -msgid ":doc:`/applications/finance/accounting/taxation/taxes/B2B_B2C`" +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 @@ -1836,11 +1835,11 @@ msgid "" ":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:81 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 msgid "Price configuration: pricelists" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 msgid "" "Pricelists are the primary tool to manage prices on your eCommerce. They " "allow you to define website-specific prices - different from the price on " @@ -1851,12 +1850,12 @@ msgid "" "the **Public Pricelist** for all websites." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:90 -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:118 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 msgid "" "Pricelists can be found under :menuselection:`Website --> eCommerce --> " "Pricelists`, but must first be activated. For that, head to " @@ -1864,15 +1863,15 @@ msgid "" "the :guilabel:`Shop - Products` section. There, you can find two options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:99 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 msgid ":guilabel:`Multiple prices per product`;" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:100 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 msgid ":guilabel:`Advanced price rules (discounts, formulas)`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 msgid "" "The **first** option allows you to set different prices per customer " "*segment*, i.e., registered customers, gold customers, regular customers, " @@ -1880,11 +1879,11 @@ msgid "" "**discounts**, **margins**, **roundings**, etc." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:107 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 msgid "Foreign currency" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 msgid "" "If you are selling in **multiple currencies** and have pricelists in foreign" " currencies, customers can select their corresponding pricelist anywhere on " @@ -1896,15 +1895,15 @@ msgstr "" msgid "Pricelists selection" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:119 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" msgstr ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:122 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 msgid "Permanent discount" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 msgid "" "If you have permanently reduced the price of a product, a popular means to " "attract customers is the **strikethrough** strategy. The strategy consists " @@ -1916,7 +1915,7 @@ msgstr "" msgid "Price strikethrough" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:132 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 msgid "" "To display a 'striked' price, enable the :guilabel:`Comparison Price` option" " under :menuselection:`Website --> Configuration --> Settings --> Shop - " @@ -2867,464 +2866,425 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "探索最好的 **源网站建设** ，学习如何创建美丽的网站，将访问者转化为潜在客户或收入。" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 +msgid "" +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 +msgid "" +"Essential cookies, which are necessary for the website to function properly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 +msgid "" +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 +msgid "" +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR <https://gdpr.eu>`_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 +msgid "" +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 +msgid "" +"You can :ref:`customize the appearance of your cookies bar <cookies-" +"bar/customization>` and :ref:`edit the content of the related Cookie Policy " +"page <cookies-bar/policy>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 +msgid "" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 +msgid "" +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 +msgid "" +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 +msgid "" +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 +msgid "" +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 +msgid "" +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 +msgid "" +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 +msgid "" +"You could add a link providing access to this page, in your website's " +"footer, for example." +msgstr "" + #: ../../content/applications/websites/website/configuration/multi_website.rst:3 msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" -msgstr "Odoo的多网站功能为你的公司提供了多元化和客户细分的广泛可能性。只需点击几次，即可收获成倍的受众和更多收入！" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:12 -msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 +msgid "" +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" -"每个网站都可以完全独立的方式运行，体现在其主题、品牌、域名、页眉和页脚、页面、语言、产品、博客帖子、论坛、幻灯片、活动、实时聊天渠道等方面。我们来实际了解一下吧！" #: ../../content/applications/websites/website/configuration/multi_website.rst:18 -msgid "Setup" -msgstr "设置" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:20 msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." -msgstr "如要创建新网站，前往 :menuselection:`网站 --> 配置 --> 设置`。*创建新网站* 按钮位于第一个版块。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 +msgid "" +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 +msgid "" +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -"根据后面的提示，设置新网站名称和特定域名。如果在Odoo数据库默认域下发布新网站，则可以留空。你可以稍后设置 " -"一些国家小组，在使用GeoIP时将访问者重定向。" #: ../../content/applications/websites/website/configuration/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" -msgstr "然后，选择一个主题。新网站可能与第一个网站的目的和受众完全不同。所以请自由选择不同的主题！" +msgid "Click the :guilabel:`Create` button." +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:40 +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." -msgstr "在选择主题后，你可以开始构建网站主页。跟随紫色水滴图标，它们会引导你开始。" +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" +msgstr "" #: ../../content/applications/websites/website/configuration/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. See :ref:`domain-" -"name/existing`." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -"如果你在线运行Odoo，不要忘记将任何新域名重定向到你的Odoo数据库（`CNAME`），并在Odoo端对其进行授权。请参阅：ref:`domain-" -"name/existing`。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:52 -msgid "Create the menu" -msgstr "创建菜单" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:54 -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." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -"新网站的默认菜单包含了所有已安装的应用程序。如要编辑该菜单，点击 :menuselection:`页面 --> " -"编辑菜单`。之后，则仅需编辑当前网站的菜单。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "从一个网站切换到另一个" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:62 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." -msgstr "超级简单！编辑栏右侧有一个网站切换器。切换到另一个网站将连接到此网站的域。如果你在该网站使用另一个域，则需要用户登录。" - -#: ../../content/applications/websites/website/configuration/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 prompted to create a new page from there." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -"切换时，你将被重定向到另一个网站上的同一域路径（例如，``/shop/myproduct``）。如果不使用此URL，你将被重定向到404页面，但被提示在此创建新页面。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:76 -msgid "Add features" -msgstr "添加功能" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:78 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 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 "你安装的网站应用程序（如幻灯片、博客）可用于你的所有网站。当然，你可以通过删除菜单项，在某个网站中将它们隐藏。" +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:82 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." -msgstr "每个网站在设置中都有大量的特定选项。首先，选择要配置的网站。" +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:88 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 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 "然后，查看标有地球图标的选项。这意味着它们只会影响你正在开发的网站。" +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "例如，你可以设置特定的：" +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:96 -msgid "languages," -msgstr "语言，" +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 +msgid "" +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:98 -msgid "domain names," -msgstr "域名，" +msgid "Records and features can be made available:" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:100 -msgid "social media links," -msgstr "社交媒体链接，" +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "客户门户模式（B2C或B2B），" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "专门的在线客服渠道，" +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:106 -msgid "etc." -msgstr "等等" +msgid "Website pages" +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "其他为全局选项，适用于所有网站。" +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:111 -msgid "Manage domain names" -msgstr "管理域名" - -#: ../../content/applications/websites/website/configuration/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." +msgid "Select the website on which the page is currently published." msgstr "" -"如前所述，你的网站可以共享相同的域名，也可以使用特定的域名。如果你共享域名并希望调整每个地区的内容，请在每个网站的设置中设置国家小组 " -"。访问者将通过GeoIP被重定向到正确的网站。" -#: ../../content/applications/websites/website/configuration/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" msgstr "" -"Odoo Online默认安装GeoIP。如果你在本地部署情况下运行Odoo，请勿忘记安装 *GeoIP* 库。参见 :doc:`on-" -"premise_geo-ip-installation`" -#: ../../content/applications/websites/website/configuration/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr ":doc:`/administration/maintain/domain_names`" +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:129 +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" -msgstr "如果您建立了其他额外网站，并指定了域名，则您须做以下三件事，以实现此功能：" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." +msgstr "" #: ../../content/applications/websites/website/configuration/multi_website.rst:132 msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." -msgstr "在托管服务提供商的DNS配置中设置A记录，以便“www.mywebsite2.ext”重新定向至Odoo实例的IP。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:134 -msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." msgstr "" -"创建额外的Nginx``server`块，在其中设置您已经在 :guilabel:`Website " -"domain`字段中设置的``server_name``。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:136 -msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "重新加载，并重新启动Nginx实例以，使用新的``server``块。" +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "价格" #: ../../content/applications/websites/website/configuration/multi_website.rst:139 -msgid "Customize the visitor experience" -msgstr "自定义访问者体验" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:142 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." +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" msgstr "" -"通过 \\*定制\\* " -"菜单，可深度定制客户体验。这里所有可用的视觉选项都针对的是每个网站。浏览各个页面并针对新受众进行调整。重点关注工作流程和自动化页面（如电子商务结帐、博客、活动管理等），因为这里的可用选项极多。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:152 -msgid "Publish specific content per website" -msgstr "按网站发布具体内容" +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "报告" #: ../../content/applications/websites/website/configuration/multi_website.rst:155 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 "" -"与静态页面一样，从前端创建的任何内容（产品、博客帖子等） 均只能在当前网站上发布。你可从后端编辑表单视图中更改，并将 *网站* " -"字段留空。这样就将在所有网站上发布。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:163 -msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "以下是你可以链接到 *一个或所有网站* 的所有对象：" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "电子商务的产品类别" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:170 -msgid "Blogs" -msgstr "博文" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:172 -msgid "Slide Channels" -msgstr "幻灯片频道" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:174 -msgid "Forums" -msgstr "论坛" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:176 -msgid "Events" -msgstr "活动" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:178 -msgid "Job Positions" -msgstr "工作岗位" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:181 -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 "当你从后端创建记录并发布时（通常是产品或活动），它在所有网站上均可用。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:185 -msgid "Publish a page in all websites" -msgstr "在所有网站发表某个页面" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:187 -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 "" -"只能在当前网站创建新的静态页面并发布。你可以将它复制到其他网站，路径为 :menuselection:`网站 --> 配置 --> 页面`。请将 " -"*网站* 字段留空。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:191 -msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." -msgstr "如果你只需将它复制到另外一个网站，请复制页面并设置新网站。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:197 -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 "再次编辑页面时，更改只影响当前网站。新页面被复制并绑定到网站上。原页面仍链接到所有网站。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:202 -msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." -msgstr "通过页面管理器按URL对页面进行分组，你可以快速找到每个编辑页面后面的原始页面。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:209 -msgid "Multi-companies" -msgstr "多公司" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." -msgstr "在多公司环境中，每个网站都可以链接到你系统中的特定公司。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:217 -msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." -msgstr "利用这项配置，只有与公司相关的数据出现在网站上（产品、工作、活动等）。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:220 -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 "网站编辑只能查看和编辑他们有访问权限的记录页面，通常是属于他们目前的公司（及其子公司）的页面。访问者也是如此。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:226 -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 "如果网站是多公司，你在切换网站时无法切换公司。如要切换公司并查看相关内容，需使用菜单中的公司选择器。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:232 -msgid "Configure your eCommerce website" -msgstr "配置你的电子商务网站" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:234 -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 "电子商务是多网站环境中的一项关键功能。在我们的网站上，这项功能可定制，以适应每个网站的受众。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:239 -msgid "Products only available on one website" -msgstr "产品仅在一个网站可用" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:241 -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 "我们之前已经了解了如何仅在一个网站发布特定记录。你可使用产品编辑表单电子商务选项卡的\\*网站\\*字段。留空意味着在所有网站均可用。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:249 -msgid "Products available on *some* websites" -msgstr "产品在 *部分* 网站可用" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:251 -msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." -msgstr "如要使产品在部分而不是所有网站可用，你应为每个网站复制产品。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:254 -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 "" -"如果你需要通过唯一参考编号来管理库存，你应安装 *制造* 应用程序并创建 *套件* (BoMs) " -"物料清单。每个套件将每个发布的“虚拟”产品关联到库存中管理的主要参考编号。这样，从你的网站出售的任何项目将在交货单中转换为可库存的产品。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:261 -msgid "Pricelists" -msgstr "价格表" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." -msgstr "如要按网站管理特定价格，你可在网站设置中启用 *每款产品的多个销售价格* 。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. You can also choose to have a pricelist available " -"*only* on a specific website." +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:270 -msgid ":doc:`../../ecommerce/managing_products/price_management`." +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" msgstr "" -#: ../../content/applications/websites/website/configuration/multi_website.rst:275 -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 "如果选择了 *可选择* ，字段留空则意味着它适用于所有网站。否则，它只能用于销售和POS应用程序的后端操作。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "付款服务提供商和交货方式" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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." +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" msgstr "" -"所有网站默认部署已发布的付款服务提供商和交货方式。您可以在配置中选择国家，使用地理IP，在各个国家使用特定的付款服务提供商。也可以填写*website*字段，按网站进行操作。" -#: ../../content/applications/websites/website/configuration/multi_website.rst:290 +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 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." +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." msgstr "" -"有一个设置可用于选择在网站设置中管理客户帐户的方式。你可以允许客户在所有网站使用同一个帐户，也可以强制要求他们为每个网站创建一个帐户。最后这种选项可避免给访问者留下各个网站相互关联的印象。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "关于自定义的技术提示" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "如果你想在网站上发布自定义对象，以下几条提示将有助于它在多网站中运行：" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "网站地图：不要忘记仅发布路线中的域名" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "只发布可用记录的网站地图中的域。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "访问：应在控制器中调用方法" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "*can_access_from_current_website* 以确保访问者可在当前网站中看到记录。" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "搜索：当显示记录列表时，" - -#: ../../content/applications/websites/website/configuration/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "不要忘记指定域只显示当前网站可用的记录。" #: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 msgid "Geo IP Installation (On-Premises Database)" @@ -4776,10 +4736,6 @@ msgstr "" "您可以在以下位置自定义文件*robots*：ref:`开发者模式 <developer-" "mode>`来自`设置-->技术-->用户界面-->视图`（排除机器人，排除一些页面，重定向到自定义网站地图）。使视图的模型数据*不可更新*以在系统升级后不重置文件。" -#: ../../content/applications/websites/website/reporting.rst:5 -msgid "Reporting" -msgstr "报告" - #: ../../content/applications/websites/website/reporting/google_analytics.rst:3 msgid "How to track your website's traffic in Google Analytics" msgstr "如何在Google Analytics中跟踪你的网站流量" diff --git a/locale/zh_TW/LC_MESSAGES/finance.po b/locale/zh_TW/LC_MESSAGES/finance.po index 7c40ec03f..5d31d0ca3 100644 --- a/locale/zh_TW/LC_MESSAGES/finance.po +++ b/locale/zh_TW/LC_MESSAGES/finance.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Martin Trigaux, 2023\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/odoo/teams/41243/zh_TW/)\n" @@ -539,10 +539,10 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes.rst:53 #: ../../content/applications/finance/accounting/taxes/B2B_B2C.rst:60 #: ../../content/applications/finance/accounting/taxes/cash_basis.rst:14 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:30 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:17 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:20 #: ../../content/applications/finance/accounting/taxes/retention.rst:23 -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:13 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:13 #: ../../content/applications/finance/accounting/vendor_bills/invoice_digitization.rst:18 #: ../../content/applications/finance/documents.rst:17 #: ../../content/applications/finance/fiscal_localizations.rst:21 @@ -566,7 +566,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:9 #: ../../content/applications/finance/payment_providers/demo.rst:9 #: ../../content/applications/finance/payment_providers/mollie.rst:8 -#: ../../content/applications/finance/payment_providers/paypal.rst:122 +#: ../../content/applications/finance/payment_providers/paypal.rst:136 #: ../../content/applications/finance/payment_providers/sips.rst:9 #: ../../content/applications/finance/payment_providers/wire_transfer.rst:30 msgid "Configuration" @@ -1672,7 +1672,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/foreign_currency.rst:44 msgid "Create a new bank account" -msgstr "" +msgstr "建立新的銀行賬戶" #: ../../content/applications/finance/accounting/bank/foreign_currency.rst:46 msgid "" @@ -3882,6 +3882,97 @@ msgid "" ":guilabel:`Other Info` tab of the invoice." msgstr "" +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:3 +msgid "Incoterms" +msgstr "國際貿易術語" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:5 +msgid "" +":abbr:`Incoterms (International Commercial Terms)` are standardized trade " +"terms used in international transactions to define the rights and " +"responsibilities of buyers and sellers. They establish the obligations " +"related to the delivery of goods, the transfer of risks, and the " +"distribution of costs between the parties involved. Incoterms specify " +"important details, such as the point at which the risk and costs transfer " +"from the seller to the buyer, the responsibility for transportation, " +"insurance, customs clearance, and other relevant aspects of the transaction." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:13 +msgid "By default, all 11 Incoterms are available in Odoo:" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:15 +msgid "**EXW**: Ex works" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:16 +msgid "**FCA**: Free carrier" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:17 +msgid "**FAS**: Free alongside ship" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:18 +msgid "**FOB**: Free on board" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:19 +msgid "**CFR**: Cost and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:20 +msgid "**CIF**: Cost, insurance and freight" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:21 +msgid "**CPT**: Carriage paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:22 +msgid "**CIP**: Carriage and insurance paid to" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:23 +msgid "**DPU**: Delivered at place unloaded" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:24 +msgid "**DPA**: Delivered at place" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:25 +msgid "**DDP**: Delivered duty paid" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:28 +msgid ":doc:`../reporting/intrastat`" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:33 +msgid "Define an Incoterm" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:35 +msgid "" +"To define an Incoterm manually, create an invoice or bill, click the " +":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:41 +msgid "Default Incoterm configuration" +msgstr "" + +#: ../../content/applications/finance/accounting/customer_invoices/incoterms.rst:43 +msgid "" +"You can set a default Incoterm rule to **automatically** populate the " +"Incoterm field on all newly created invoices and bills. Under " +":menuselection:`Accounting/Invoicing --> Configuration --> Settings`, scroll" +" down to the :guilabel:`Customer Invoices` section, and select an Incoterm " +"in the :guilabel:`Default Incoterm` field." +msgstr "" + #: ../../content/applications/finance/accounting/customer_invoices/overview.rst:3 msgid "Invoicing processes" msgstr "" @@ -4460,7 +4551,7 @@ msgstr "" #: ../../content/applications/finance/accounting/customer_invoices/payment_terms.rst:117 msgid "Product Sales" -msgstr "" +msgstr "產品銷售" #: ../../content/applications/finance/accounting/customer_invoices/payment_terms.rst:117 #: ../../content/applications/finance/fiscal_localizations/peru.rst:140 @@ -5695,6 +5786,7 @@ msgstr "" #: ../../content/applications/finance/accounting/get_started/chart_of_accounts.rst:189 #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:123 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:38 msgid ":doc:`../../fiscal_localizations`" msgstr "" @@ -7193,10 +7285,9 @@ msgstr "" msgid "" "A follow-up message can be sent to customers when a payment is overdue. Odoo" " helps you identify late payments and allows you to schedule and send the " -"appropriate reminders, using **follow-up actions** that trigger " -"automatically one or more actions according to the number of overdue days. " -"You can send your follow-ups via different means such as email, post, or " -"SMS." +"appropriate reminders using **follow-up actions** that automatically trigger" +" one or more actions according to the number of overdue days. You can send " +"your follow-ups via different means, such as email, post, or SMS." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:11 @@ -7208,101 +7299,133 @@ msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:16 msgid "" "To configure a :guilabel:`Follow-Up Action`, go to " -":menuselection:`Accounting --> Configuration --> Follow-up Levels`. Several " -"follow-up actions are available by default, and you can customize them any " -"way you want or create new ones to trigger the following actions:" -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:20 -msgid "Send an email;" +":menuselection:`Accounting --> Configuration --> Follow-up Levels`, and " +"select or create (a) new follow-up level(s). Several follow-up actions are " +"available by default under the :guilabel:`Notification` tab, and the " +"**name** as well as the **number of days** can be changed. The follow-up " +":guilabel:`Actions` available are:" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:21 -msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`;" +msgid ":guilabel:`Send Email`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:22 -msgid "Print a letter;" +msgid ":ref:`Send a Letter <customer_invoices/snailmail>`;" msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:23 -msgid ":ref:`Send a letter <customer_invoices/snailmail>`;" +msgid ":ref:`Send an SMS message <pricing/pricing_and_faq>`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:24 -msgid "Manual action (creates a task)." -msgstr "" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:26 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:25 msgid "" -"It is also possible to automatically send a reminder by enabling the " -":guilabel:`Auto Execute` option, within a specific :guilabel:`Follow-Up " -"Action`." +"You can use a pre-filled template for your messages by selecting a " +":guilabel:`Content Template`. To change the template used, hover over the " +"field and click the :guilabel:`-->`. If enabled, SMS messages have a " +"specific :guilabel:`Sms Template` field." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:30 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:29 msgid "" -"To send a reminder before the actual due date is reached, set a negative " -"number of due days." +"It is possible to automatically send a reminder by enabling the " +":guilabel:`Automatic` option, and attaching the *open* invoice(s) by " +"enabling :guilabel:`Attach Invoices`, within a specific follow-up action." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:33 -msgid "Follow-up reports" -msgstr "催款報表" - -#: ../../content/applications/finance/accounting/payments/follow_up.rst:35 msgid "" -"The overdue invoices you need to follow up on are available in " -":menuselection:`Accounting --> Customers --> Follow-up Reports`. From there," -" you can identify all the customers that have late unpaid invoices." +"By clicking on the :guilabel:`Activity` tab, scheduling activities (tasks) " +"is possible. That way, an activity is automatically scheduled when the " +"follow-up is triggered. To do so, enable :guilabel:`Schedule Activity`, and " +"select a :guilabel:`Responsible` person for the task. Choose an " +":guilabel:`Activity Type`, and enter a :guilabel:`Summary` on how to handle " +"the activity, if desired." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:39 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:40 msgid "" -"When you open a customer, you see all their unpaid invoices (overdue or " -"not). The due dates of the late invoices appear in red. Select the invoices " -"that are not late yet in the :guilabel:`Excluded` column to exclude them " -"from the reminder you send." +"Set a negative number of days to send a reminder before the actual due date." msgstr "" #: ../../content/applications/finance/accounting/payments/follow_up.rst:43 +msgid "Follow-up reports" +msgstr "催款報表" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:45 msgid "" -"It is up to you to decide how to remind your customer. You can select " -":guilabel:`Print Letter`, :guilabel:`Send By Email`, :guilabel:`Send By " -"Post`, :guilabel:`Send By SMS`. Then, click on :guilabel:`Done` to view the " -"next follow-up that needs your attention." +"Overdue invoices you need to follow up on are available in " +":menuselection:`Accounting --> Customers --> Follow-up Reports`. By default," +" Odoo filters by :guilabel:`Overdue Invoices`, but you can also filter by " +":guilabel:`In need of action` in the :guilabel:`Filters` menu." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:48 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:49 msgid "" -"The contact information available on the invoice or on the contact form is " -"used to send the reminder." +"When selecting an invoice, you can see all of the customer's unpaid invoices" +" (overdue or not), with the due dates of late invoices appearing in red. You" +" can exclude invoices from a reminder by clicking :guilabel:`Exclude from " +"Follow-ups`. You can set either :guilabel:`Automatic` or :guilabel:`Manual` " +"reminders as well as a :guilabel:`Responsible` person for that customer." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:50 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:54 +msgid "" +"To send reminders, click on :guilabel:`Follow up`, and select the action(s) " +"you want to perform from:" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:57 +msgid ":guilabel:`Print`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:58 +msgid ":guilabel:`Email`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:59 +msgid ":guilabel:`Sms`;" +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +msgid ":guilabel:`By post`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +msgid "" +"You can :guilabel:`Attach Invoices` and change the content templates from " +"this view. When done, click :guilabel:`Send` or :guilabel:`Send & Print`." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:66 +msgid "" +"The contact information on the invoice or the contact form is used to send " +"the reminder." +msgstr "" + +#: ../../content/applications/finance/accounting/payments/follow_up.rst:67 msgid "" "When the reminder is sent, it is documented in the chatter of the invoice." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:51 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:68 msgid "" "If it is not the right time for a reminder, you can specify the " -":guilabel:`Next Reminder Date` and click on :guilabel:`Remind me later`. You" -" will get the next report according to the next reminder date set on the " -"statement." +":guilabel:`Next Reminder` date. You will get the next report according to " +"the next reminder date set." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:56 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 msgid "" -"Reconcile your bank statements right before launching your follow-up process" -" to avoid sending a reminder to a customer that has already paid you." +"Reconcile all bank statements right before launching the follow-up process " +"to avoid sending a reminder to a customer that has already paid." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:60 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:76 msgid "Debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:62 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 msgid "" "To know whether a customer usually pays late or not, you can set a trust " "level by marking them as :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`," @@ -7314,11 +7437,11 @@ msgstr "" msgid "Set debtor's trust level" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:70 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:86 msgid "Send reminders in batches" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:72 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:88 msgid "" "You can send reminder emails in batches from the :guilabel:`Follow-up " "Reports` page. To do so, select all the reports you would like to process, " @@ -7326,15 +7449,15 @@ msgid "" "follow-ups`." msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:77 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:93 msgid ":doc:`../../../general/in_app_purchase`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:78 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:94 msgid ":doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`" msgstr "" -#: ../../content/applications/finance/accounting/payments/follow_up.rst:79 +#: ../../content/applications/finance/accounting/payments/follow_up.rst:95 msgid ":doc:`../customer_invoices/snailmail`" msgstr "" @@ -9489,19 +9612,11 @@ msgid "" "section, tick :guilabel:`Intrastat` and then :guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:33 -msgid "" -"If your Odoo database was created before **January 13, 2022**, first " -":ref:`upgrade <general/upgrade>` the `account_intrastat` module to add the " -"new transaction codes and :ref:`install <general/install>` the " -"`account_intrastat_expiry` module to archive the old codes." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:40 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:35 msgid "Default transaction codes: invoice and refund" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:42 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:37 msgid "" "You can set a default :ref:`transaction code <intrastat/transaction-code>` " "for all newly created invoice and refund transactions. Under " @@ -9511,23 +9626,11 @@ msgid "" "automatically on all respective invoice lines." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:50 -msgid "Default Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 -msgid "" -"You can set a default :ref:`Incoterm rule <intrastat/incoterm>` to " -"automatically populate the Incoterm field on all newly created invoices and " -"bills. Under :menuselection:`Accounting --> Configuration --> Settings`, " -"select the company's :guilabel:`Default Incoterm` and then :guilabel:`Save`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:60 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:45 msgid "Region code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:62 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:47 msgid "" "The region code is **only used by Belgian companies**. Under " ":menuselection:`Accounting --> Configuration --> Settings`, select the " @@ -9535,7 +9638,7 @@ msgid "" ":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:67 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:52 msgid "" "If your warehouses are located in more than one region, you can define the " "region code at the level of each warehouse instead. To do so, go to " @@ -9547,21 +9650,21 @@ msgstr "" msgid "Adding the Intrastat region to a warehouse" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:78 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:63 msgid "Product configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:80 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:65 msgid "" "All products must be properly configured to be included in the Intrastat " "report." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:70 msgid "Commodity code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:72 msgid "" "Commodity codes are internationally recognized reference numbers used to " "classify goods depending on their **nature**. Intrastat uses the `Combined " @@ -9569,24 +9672,24 @@ msgid "" "customs-duties/customs-tariff/combined-nomenclature_en>`_." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:90 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:75 msgid "" "To add a commodity code, go to :menuselection:`Accounting --> Customers --> " "Products` and select a product. Under the :guilabel:`Accounting` tab, set " "the product's :guilabel:`Commodity Code`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:94 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:79 msgid "" "`National Bank of Belgium - Intrastat commodity codes " "<https://www.nbb.be/en/statistics/foreign-trade/nomenclature-and-codes>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:85 msgid "Quantity: weight and supplementary unit" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:102 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:87 msgid "" "Depending on the nature of the goods, it is necessary to specify either the " "product's weight in kilos (without packaging) or the product's supplementary" @@ -9594,7 +9697,7 @@ msgid "" "or gram (`g`)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:91 msgid "" "To add a product's weight or supplementary unit, go to " ":menuselection:`Accounting --> Customers --> Products` and select a product." @@ -9603,39 +9706,39 @@ msgid "" ":guilabel:`Supplementary Units`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:113 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:98 msgid "Country of origin" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:115 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:100 msgid "" "To add the product's country of origin, go to :menuselection:`Accounting -->" " Customers --> Products` and select a product. Under the " ":guilabel:`Accounting` tab, set the :guilabel:`Country of Origin`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:121 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:106 msgid "Invoices and bills configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:123 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:108 msgid "" "Once products are properly configured, several settings must be configured " "on the invoices and bills you create." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:129 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:114 msgid "Transaction code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:131 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:116 msgid "" "Transaction codes are used to identify a transaction's nature. :ref:`Default" " transaction codes <intrastat/default-transaction-codes>` can be set for " "invoice and refund transactions." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:119 msgid "" "To set a transaction code on an invoice line, create an invoice or a bill, " "click the columns selection button, tick :guilabel:`Intrastat`, and use the " @@ -9646,96 +9749,73 @@ msgstr "" msgid "Adding the Intrastat column to an invoice or bill" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:143 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:128 msgid "" "`National Bank of Belgium - Intrastat: Nature of transactions from January " "2022 " "<https://www.nbb.be/doc/dd/onegate/data/new_natures_of_transaction_2022_en.pdf>`_" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:149 -msgid "Incoterm rule" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 -msgid "" -"Incoterms are 11 internationally recognized rules defining the " -"responsibilities of sellers and buyers, specifying who is responsible for " -"paying and managing the shipment, insurance, documentation, customs " -"clearance, and other logistical activities. A :ref:`default Incoterm " -"<intrastat/default-incoterm>` can be set for all invoices and bills." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:156 -msgid "" -"To set the Incoterm manually, create an invoice or a bill, click the " -":guilabel:`Other Info` tab, and select the :guilabel:`Incoterm`." -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:160 -msgid "`Wikipedia: Incoterms <https://en.wikipedia.org/wiki/Incoterms>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:134 msgid "Partner country" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:136 msgid "" "The partner country represents the vendor's country for bills and the " "customer's country for invoices. It is automatically filled in using the " "country set in the contact's :guilabel:`Country` field." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:171 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:140 msgid "" "To edit the partner country manually, create an invoice or a bill, click the" " :guilabel:`Other Info` tab, and select the :guilabel:`Intrastat Country`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:177 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:146 msgid "Transport code" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:179 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:148 msgid "" "The transport code identifies the presumed **mode of transport** used to " "send the goods (arrival or dispatch)." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:151 msgid "" "To add the transport code, create an invoice or a bill, go to the " ":guilabel:`Other info` tab, and select the :guilabel:`Intrastat Transport " "Mode`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:188 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:157 msgid "Value of the goods" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:159 msgid "" "The value of a good is the untaxed :guilabel:`Subtotal` (:guilabel:`Price` " "multiplied by :guilabel:`Quantity`) of an invoice line." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:165 msgid "Partner configuration" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:167 msgid "" "Two fields from the partner's contact form are used with Intrastat: " ":guilabel:`VAT` and :guilabel:`Country`. The country can be :ref:`manually " "set <intrastat/partner-country>` on the invoice or bill." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:203 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:172 msgid "Generate the Intrastat report" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:205 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:174 msgid "" "Generate the report by going to :menuselection:`Accounting --> Reporting -->" " Audit Reports: Intrastat Report`. It is automatically computed based on the" @@ -9745,73 +9825,73 @@ msgid "" ":ref:`partners <intrastat/partner>`." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:211 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:180 msgid "" "Export the report as a PDF, XLSX, or XML file to post it to your legal " "administration." msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:213 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:182 msgid "" "Each report line refers to a single invoice line and contains the following " "information:" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:215 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:184 msgid "Invoice or bill reference number;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:216 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:185 msgid "" "System, which is a code automatically generated depending on whether the " "document is an invoice (dispatch) or a bill (arrival);" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:218 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:187 msgid "" ":ref:`Country <intrastat/partner-country>`, which is the vendor's country " "for arrivals and the customer's country for dispatches;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:220 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:189 msgid ":ref:`Transaction Code <intrastat/transaction-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:221 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:190 msgid "" "(If your company is located in Belgium) :ref:`Region Code <intrastat/region-" "code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:222 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:191 msgid ":ref:`Commodity Code <intrastat/commodity-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:223 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:192 msgid ":ref:`Origin Country <intrastat/origin-country>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:224 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:193 msgid ":ref:`Partner VAT <intrastat/partner>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:225 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:194 msgid ":ref:`Transport Code <intrastat/transport-code>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:226 -msgid ":ref:`Incoterm Code <intrastat/incoterm>`;" +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:195 +msgid ":doc:`Incoterm Code <../customer_invoices/incoterms>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:227 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:196 msgid ":ref:`Weight <intrastat/quantity>`;" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:228 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:197 msgid ":ref:`Supplementary Units <intrastat/quantity>`; and" msgstr "" -#: ../../content/applications/finance/accounting/reporting/intrastat.rst:229 +#: ../../content/applications/finance/accounting/reporting/intrastat.rst:198 msgid "" ":ref:`Value <intrastat/value>`, which is always expressed in euros even if " "the original invoice or bill used another currency." @@ -10152,7 +10232,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/reporting/tax_returns.rst:121 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:69 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:37 #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:114 #: ../../content/applications/finance/accounting/taxes/retention.rst:70 msgid ":doc:`../taxes`" @@ -11223,7 +11303,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/accounting/taxes/avatax.rst:74 -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:68 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:39 #: ../../content/applications/finance/accounting/taxes/taxcloud.rst:151 msgid ":doc:`fiscal_positions`" msgstr "" @@ -11398,52 +11478,33 @@ msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:5 msgid "" -"**Distance sales within the European Union** include cross-border sales of " -"goods and services to a private consumer (B2C) in another EU Member State " -"when the seller doesn't meet face-to-face with the customer. Organizations " -"must ensure that the VAT on distance sales is paid to the Member State in " -"which the goods or services are delivered." +"EU intra-community distance selling involves the cross-border trade of goods" +" and services from vendors registered for VAT purposes to individuals (B2C) " +"located in a European Union member state. The transaction is conducted " +"remotely, typically through online platforms, mail orders, telephone, or " +"other means of communication." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:11 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:10 msgid "" -"This remains true even if your organization is located outside of the " +"EU intra-community distance selling is subject to specific VAT rules and " +"regulations. The vendor must charge VAT per the VAT rate applicable in the " +"buyer's country." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:14 +msgid "" +"This remains applicable even if the vendor is located outside of the " "European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:13 -msgid "" -"While this regulation mainly applies to :doc:`eCommerce " -"<../../../websites/ecommerce>` sales to private EU consumers, it is also " -"valid for mail order sales and telesales." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:16 -msgid "" -"The Union **One-Stop Shop (OSS)** is an online portal where businesses can " -"register for the OSS and declare their intra-community distance sales. Each " -"EU member state integrates an online OSS portal." -msgstr "" - #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:19 msgid "" -"The **EU intra-community Distance Selling** feature helps your organization " -"comply with this regulation by creating and configuring new :doc:`fiscal " -"positions <fiscal_positions>` and :doc:`taxes <../taxes>` based on your " -"company's country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:24 -msgid "" -"`European Commission: OSS | Taxation and Customs Union " -"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:32 -msgid "" -"Go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes`, then " -"enable **EU intra-community Distance Selling** (or **EU Digital Goods VAT** " -"if you created your database before July 1, 2021), and *Save*." +"The **EU Intra-community Distance Selling** feature helps you comply with " +"this regulation by creating and configuring new **fiscal positions** and " +"**taxes** based on your company's country. To enable it, go to " +":menuselection:`Accounting --> Configuration --> Settings --> Taxes`, tick " +":guilabel:`EU Intra-community Distance Selling`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 @@ -11451,46 +11512,60 @@ msgid "" "EU intra-community Distance Selling feature in Odoo Accounting settings" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:41 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:28 msgid "" -"Please :ref:`upgrade the module <general/upgrade>` `l10n_eu_service` if you " -"already installed it before **July 1, 2021**, or if you activated the " -"feature **EU Digital Goods VAT** in the Accounting settings. Then, make sure" -" to :ref:`refresh the tax mapping <eu_distance_selling/refresh-mapping>`." +"Whenever you add or modify taxes, you can automatically update your fiscal " +"positions. To do so, go to :menuselection:`Accounting/Invoicing --> Settings" +" --> Taxes --> EU Intra-community Distance Selling` and click on the " +":guilabel:`Refresh tax mapping`." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:49 -msgid "Fiscal Positions and Taxes" -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:51 -msgid "" -"Once enabled, the feature automatically creates all the necessary taxes and " -"fiscal positions needed for each EU member state, based on your company's " -"country." -msgstr "" - -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:33 msgid "" "We highly recommend checking that the proposed mapping is suitable for the " "products and services you sell before using it." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:60 -msgid "Refresh tax mapping" +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:42 +msgid "One-Stop Shop (OSS)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:62 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:44 msgid "" -"Whenever you add or modify taxes, you can update automatically your fiscal " -"positions." +"The :abbr:`OSS (One-Stop Shop)` system introduced by the European Union " +"simplifies VAT collection for **cross-border** sales of goods and services. " +"It primarily applies to business-to-consumer **(B2C)** cases. With the OSS, " +"businesses can register for VAT in their home country and use a single " +"online portal to handle VAT obligations for their sales within the EU. There" +" are **two primary schemes**: the **Union OSS** scheme for cross-border " +"services and the **Import OSS** scheme for goods valued at or below €150." msgstr "" -#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:64 +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:52 +#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 +msgid "Reports" +msgstr "報表" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:54 msgid "" -"To do so, go to :menuselection:`Accounting/Invoicing --> Settings --> Taxes " -"--> EU intra-community Distance Selling` and click on the *Refresh tax " -"mapping* button." +"To generate **OSS sales** or **OSS imports** reports and submit them onto " +"the OSS portal, go to :menuselection:`Accounting --> Reporting --> Tax " +"Report`, click :guilabel:`Report: Generic Tax report`, and select either " +":guilabel:`OSS Sales` or :guilabel:`OSS Imports`. Once selected, click on " +":guilabel:`PDF`, :guilabel:`XLSX`, or :guilabel:`XML` in the top-left " +"corner. This generates the currently-opened report in the selected format. " +"Once generated, log into the platform of your competent federal authority to" +" submit it onto the OSS portal." +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst-1 +msgid "OSS reports view" +msgstr "" + +#: ../../content/applications/finance/accounting/taxes/eu_distance_selling.rst:65 +msgid "" +"`European Commission: OSS | Taxation and Customs Union " +"<https://ec.europa.eu/taxation_customs/business/vat/oss_en>`_" msgstr "" #: ../../content/applications/finance/accounting/taxes/fiscal_positions.rst:3 @@ -11998,70 +12073,70 @@ msgid "" "might be unexpected from a user point of view." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:3 -msgid "VIES VAT numbers validation" +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:3 +msgid "VAT numbers verification (VIES)" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:5 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:5 msgid "" "**VAT Information Exchange System** - abbreviated **VIES** - is a tool " "provided by the European Commission that allows you to check the validity of" " VAT numbers of companies registered in the European Union." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:9 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:9 msgid "" "Odoo provides a feature to **Verify VAT Numbers** when you save a contact. " "This helps you make sure that your contacts provided you with a valid VAT " "number without leaving Odoo interface." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:15 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:15 msgid "" "To enable this feature, go to :menuselection:`Accounting --> Configuration " "--> Settings --> Taxes`, enable the **Verify VAT Numbers** feature, and " "click on *Save*." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "Enable \"Verify VAT Numbers\" in Odoo Accounting" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:23 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:23 msgid "VAT Number validation" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:25 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:25 msgid "" "Whenever you create or modify a contact, make sure to fill out the " "**Country** and **VAT** fields." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Fill out the contact form with the country and VAT number before clicking on" " *Save*" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:31 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:31 msgid "" "When you click on *Save*, Odoo runs a VIES VAT number check, and displays an" " error message if the VAT number is invalid." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst-1 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst-1 msgid "" "Odoo displays an error message instead of saving when the VAT number is " "invalid" msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:39 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:39 msgid "" "This tool checks the VAT number's validity but does not check the other " "fields' validity." msgstr "" -#: ../../content/applications/finance/accounting/taxes/vat_validation.rst:43 +#: ../../content/applications/finance/accounting/taxes/vat_verification.rst:43 msgid "" "`European Commission: VIES search engine " "<https://ec.europa.eu/taxation_customs/vies/vatRequest.html>`__" @@ -12092,7 +12167,6 @@ msgid "Bill creation" msgstr "" #: ../../content/applications/finance/accounting/vendor_bills.rst:19 -#: ../../content/applications/finance/expenses.rst:58 msgid "Manually" msgstr "手工" @@ -13458,330 +13532,919 @@ msgstr "費用" #: ../../content/applications/finance/expenses.rst:7 msgid "" -"**Odoo Expenses** streamlines the management of expenses. Employees can " -"submit their expenses; managers can approve them; accountants can record " -"them and process the payments." +"Odoo **Expenses** streamlines the management of expenses. After an employee" +" submits their expenses in Odoo, the expenses are reviewed by management and" +" accounting teams. Once approved, payments can then be processed and " +"disbursed back to the employee for reimbursement(s)." msgstr "" -#: ../../content/applications/finance/expenses.rst:11 +#: ../../content/applications/finance/expenses.rst:12 msgid "`Odoo Expenses: product page <https://www.odoo.com/app/expenses>`_" msgstr "" -#: ../../content/applications/finance/expenses.rst:14 -msgid "How to set expense types" +#: ../../content/applications/finance/expenses.rst:15 +msgid "Set expense types" msgstr "" -#: ../../content/applications/finance/expenses.rst:16 +#: ../../content/applications/finance/expenses.rst:17 msgid "" -"The first step to track expenses is to configure the expense types (managed " -"as products in Odoo) that your company allows, from the *Configuration* " -"menu. When a specific expense is reimbursed at a fixed price, set a cost on " -"the product. Otherwise keep the cost at 0.0 and employees will report the " -"real cost per expense." +"The first step to track expenses is to configure the different *expense " +"types* for the company (managed as *products* in Odoo). Each \"product\" can" +" be as specific or generalized as needed. Go to :menuselection:`Expenses app" +" --> Configuration --> Expense Products` to view the current expensable " +"products in a default kanban view." msgstr "" -#: ../../content/applications/finance/expenses.rst:24 -msgid "Here are some examples:" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Set expense costs on products." msgstr "" #: ../../content/applications/finance/expenses.rst:26 -msgid "Restaurant:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:28 -#: ../../content/applications/finance/expenses.rst:34 -msgid "Cost: 0.00 (the cost of the ticket will be recorded on every expense)" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:29 -msgid "Travel with Personal Car:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:31 -msgid "Cost: 0.30 (the price per mile reimbursed by the company is fixed)" +msgid "" +"To create a new expense product, click :guilabel:`Create`. A product form " +"will appear. Only two fields are required, the :guilabel:`Product Name` and " +"the :guilabel:`Unit of Measure`. Enter the :guilabel:`Product Name` in the " +"field, and select the :guilabel:`Unit of Measure` from the drop-down menu " +"(most products will be set to :guilabel:`Units`)." msgstr "" #: ../../content/applications/finance/expenses.rst:32 -msgid "Hotel:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:36 -msgid "Others:" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:38 -msgid "Cost: 0.0" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:40 msgid "" -"Don't forget to set an expense tax on each expense type (and an account if " -"you use Odoo Accounting). It's usually a good practice to use a tax that is " -"configured with :ref:`Tax Included in Price <taxes/included-in-price>`. That" -" way, employees report expenses with prices including taxes, which is " -"usually the expected behaviour." +"The *Sales* app is where specification on the units of measure are created " +"and edited (e.g. units, miles, nights, etc.). Go to :menuselection:`Sales " +"app --> Configuration --> Settings` and ensure `Units of Measure` is checked" +" off in the `Product Catalog` section. Click on the :guilabel:`Units of " +"Measure` internal link to view, create, and edit the units of measure. Refer" +" to :doc:`this document " +"</applications/inventory_and_mrp/inventory/management/products/uom>` to " +"learn more about units of measure and how to configure them." msgstr "" -#: ../../content/applications/finance/expenses.rst:48 +#: ../../content/applications/finance/expenses.rst:43 msgid "" -"The *Sales* app allows you to specify units of measure for your expense " -"types (units, miles, nights, etc.). Go to :menuselection:`Sales --> " -"Configuration --> Settings` and check *Some products may be sold/purchased " -"in different units of measure (advanced)*." +"The :guilabel:`Cost` field on the product form is populated with a value of " +"`0.00` by default. When a specific expense should always be reimbursed for a" +" particular price, enter that amount in the :guilabel:`Cost` field. " +"Otherwise, leave the :guilabel:`Cost` set to `0.00`, and employees will " +"report the actual cost when submitting an expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:49 +msgid "" +"Here are some examples for when to set a specific :guilabel:`Cost` on a " +"product vs. leaving the :guilabel:`Cost` at `0.00`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:52 +msgid "" +"**Meals**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense for a meal, they enter the actual amount of the bill and will be " +"reimbursed for that amount. An expense for a meal costing $95.23 would equal" +" a reimbursement for $95.23." msgstr "" #: ../../content/applications/finance/expenses.rst:55 -msgid "How to record expenses" +msgid "" +"**Mileage**: Set the :guilabel:`Cost` to `0.30`. When an employee logs an " +"expense for \"mileage\", they enter the number of miles driven, and are " +"reimbursed 0.30 per mile they entered. An expense for 100 miles would equal " +"a reimbursement for $30.00." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:58 +msgid "" +"**Monthly Parking**: Set the :guilabel:`Cost` to `75.00`. When an employee " +"logs an expense for \"monthly parking\", the reimbursement would be for " +"$75.00." msgstr "" #: ../../content/applications/finance/expenses.rst:60 msgid "" -"As an employee (Employee in user access rights), you can record expenses " -"from :menuselection:`My Expenses --> Expenses to Submit`." +"**Expenses**: Set the :guilabel:`Cost` to `0.00`. When an employee logs an " +"expense that is not a meal, mileage, or monthly parking, they use the " +"generic :guilabel:`Expenses` product. An expense for a laptop costing " +"$350.00 would be logged as an :guilabel:`Expenses` product, and the " +"reimbursement would be for $350.00." msgstr "" -#: ../../content/applications/finance/expenses.rst:66 +#: ../../content/applications/finance/expenses.rst:65 msgid "" -"Select the related product and enter either the total amount you paid (with " -"Quantity = 1) or the unit price if Quantity is countable (e.g. number of " -"hotel nights)." +"Select an :guilabel:`Expense Account` if using the Odoo *Accounting* app. It" +" is recommended to check with the accounting department to determine the " +"correct account to reference in this field as it will affect reports." msgstr "" #: ../../content/applications/finance/expenses.rst:69 -msgid "Enter the expense date." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:70 msgid "" -"Choose if you paid the bill on your own (and expect to be reimbursed) or if " -"the company paid directly (e.g. if you used a company's credit card)." +"Set a tax on each product in the :guilabel:`Vendor Taxes` and " +":guilabel:`Customer Taxes` fields if applicable. It is considered good " +"practice to use a tax that is configured with :ref:`Tax Included in Price " +"<taxes/included-in-price>`. Taxes will be automatically configured if this " +"is set." msgstr "" -#: ../../content/applications/finance/expenses.rst:72 +#: ../../content/applications/finance/expenses.rst:76 +msgid "Record expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:79 +msgid "Manually create a new expense" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:81 msgid "" -"Set the bill reference, add some notes if requested and attach a photo/scan " -"of the receipt from the discussion thread. That will help the manager and " -"the accountant validate it." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:80 -msgid "In one click from emails" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:82 -msgid "" -"Let your employees record their expenses from a simple email. Make a " -"snapshot of the receipt and send it by email, or simply forward a bill!" +"To record a new expense, begin in the main :menuselection:`Expenses` app " +"dashboard, which presents the default :guilabel:`My Expenses to Report` " +"view. This view can also be accessed from :menuselection:`Expenses app --> " +"My Expenses --> My Expenses to Report`." msgstr "" #: ../../content/applications/finance/expenses.rst:85 msgid "" -"The only thing to do is setting up an email alias in " -":menuselection:`Expenses --> Configuration --> Settings` (e.g. *expenses* " -"@mycompany.odoo.com). For security purposes, only authenticated employee " -"emails (cfr. *Work Email* in employee detail form) are accepted." +"First, click :guilabel:`Create`, and then fill out the various fields on the" +" form." msgstr "" -#: ../../content/applications/finance/expenses.rst:91 +#: ../../content/applications/finance/expenses.rst:87 msgid "" -"The expense product is set automatically if the mail subject contains the " -"product's internal reference in first position. Type the expense amount in " -"the mail subject to set it on the expense too (e.g. Ref001 Food 100€)." +":guilabel:`Description`: Enter a short description for the expense in the " +":guilabel:`Description` field. This should be short and informative, such as" +" `lunch with client` or `hotel for conference`." msgstr "" -#: ../../content/applications/finance/expenses.rst:96 -msgid "How to submit expenses to managers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:98 +#: ../../content/applications/finance/expenses.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." +":guilabel:`Product`: Select the product from the drop-down menu that most " +"closely corresponds to the expense. For example, an airplane ticket would be" +" appropriate for an expense :guilabel:`Product` named :guilabel:`Air " +"Travel`." msgstr "" -#: ../../content/applications/finance/expenses.rst:108 +#: ../../content/applications/finance/expenses.rst:93 msgid "" -"You can also submit expenses one by one from the *Submit to Manager* button " -"on the form view of an expense." +":guilabel:`Unit Price`: Enter the total amount paid for the expense in one " +"of two ways:" msgstr "" -#: ../../content/applications/finance/expenses.rst:111 +#: ../../content/applications/finance/expenses.rst:95 msgid "" -"All your submitted expense reports can be found in :menuselection:`Expenses " -"--> My Expenses --> Expense Reports`." +"If the expense is for one single item/expense, enter the cost in the " +":guilabel:`Unit Price` field, and leave the :guilabel:`Quantity` `1.00`." msgstr "" -#: ../../content/applications/finance/expenses.rst:116 -msgid "How to approve expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:118 +#: ../../content/applications/finance/expenses.rst:97 msgid "" -"HR and team managers get an overview of all expense reports to validate from" -" the top menu :menuselection:`To Approve --> Expense Reports to Approve`. " -"Such users must have at least *Officers* access rights for *Expenses*." +"If the expense is for multiples of the same item/expense, enter the price " +"*per unit* in the :guilabel:`Unit Price` field, and enter the *quantity of " +"units* in the :guilabel:`Quantity` field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:102 +msgid "" +"In the case of a hotel stay, for example, the :guilabel:`Unit Price` would " +"be set as the cost *per night*, and set the :guilabel:`Quantity` to the " +"*number of nights* stayed." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:105 +msgid "" +":guilabel:`Taxes`: If taxes were paid on the expense, select the tax " +"percentage using the drop-down menu. Tax options are pre-configured based on" +" the localization setting selected when the database was created. Adding any" +" new taxes should only be done when necessary." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:110 +msgid "" +"When a tax is selected, the :guilabel:`Total` value will update in real time" +" to show the added taxes." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:113 +msgid "" +":guilabel:`Paid By`: Click the radio button to indicate who paid for the " +"expense and should be reimbursed. If the employee paid for the expense (and " +"should be reimbursed) select :guilabel:`Employee (to reimburse)`. If the " +"company paid directly instead (e.g. if the company credit card was used to " +"pay for the expense) select :guilabel:`Company`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:117 +msgid "" +":guilabel:`Expense Date`: Using the calendar module, enter the date the " +"expense was incurred. Use the :guilabel:`< (left)` and :guilabel:`> (right)`" +" arrows to navigate to the correct month, then click on the specific day to " +"enter the selection." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:120 +msgid "" +":guilabel:`Bill Reference`: If there is any reference text that should be " +"included for the expense, enter it in this field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:122 +msgid "" +":guilabel:`Account`: Select the expense account that this expense should be " +"logged on from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:124 +msgid "" +":guilabel:`Employee`: Using the drop-down menu, select the employee this " +"expense is for." msgstr "" #: ../../content/applications/finance/expenses.rst:125 msgid "" -"They can review expense reports, approve or reject them, as well as " -"providing feedback thanks to the integrated communication tool." +":guilabel:`Customer to Reinvoice`: If the expense is something that should " +"be paid for by a customer, select the customer that will be invoiced for " +"this expense from the drop-down menu. For example, if a customer wishes to " +"have an on-site meeting, and agrees to pay for the expenses associated with " +"it (such as travel, hotel, meals, etc.), then all expenses tied to that " +"meeting would indicate that customer as the :guilabel:`Customer to " +"Reinvoice`." msgstr "" -#: ../../content/applications/finance/expenses.rst:131 +#: ../../content/applications/finance/expenses.rst:130 msgid "" -"As a team manager you can easily find the expense reports of your team " -"members. You need to be set as manager in the detail form of those " -"employees." +":guilabel:`Analytic Account`: Select the account the expense should be " +"written against from the drop-down menu." msgstr "" -#: ../../content/applications/finance/expenses.rst:139 -msgid "How to post expenses in accounting" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:141 +#: ../../content/applications/finance/expenses.rst:132 msgid "" -"Once expense reports approved by managers, the accounting department goes to" -" :menuselection:`Expenses --> Accountant --> Expense Reports To Post` to " -"check accounts, products and taxes. They can click *Post Journal Entries* to" -" post related journal entries into your books. To do so, the user must have " -"following access rights:" +":guilabel:`Company`: If multiple companies are set-up, select the company " +"this expense should be filed for from the drop-down menu. If there is only " +"one company, this field will be automatically populated." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:135 +msgid "" +":guilabel:`Notes...`: If any notes are needed in order to clarify the " +"expense, enter them in the notes field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:138 +msgid "Once all the fields have been filled out, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "A filled in expense form for a client lunch." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:145 +msgid "Attach a receipt" msgstr "" #: ../../content/applications/finance/expenses.rst:147 -msgid "Accounting: Accountant or Adviser" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:148 -msgid "Expenses: Manager" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:151 msgid "" -"To post an expense, a *Home Address* must be set on the employee. If you get" -" a related blocking message when posting, click the employee, go to " -"*Personal Information* tab and select/create the contact of your employee in" -" the address book. A contact has been automatically created if this person " -"is using Odoo." +"After the expense is saved, the next step is to attach a receipt. A new " +":guilabel:`Attach Receipt` button appears after the entry is saved, beneath " +"the former :guilabel:`Save` button (which turns into an :guilabel:`Edit` " +"button)." msgstr "" -#: ../../content/applications/finance/expenses.rst:158 -msgid "How to reimburse employees" +#: ../../content/applications/finance/expenses.rst-1 +msgid "Attach a receipt after saving the record." msgstr "" -#: ../../content/applications/finance/expenses.rst:160 +#: ../../content/applications/finance/expenses.rst:155 msgid "" -"You can now see all the expense reports to reimburse in " -":menuselection:`Expenses --> Accountant --> Expense Reports To Pay`. To " -"record the payment or pay by check, click *Register a Payment*." -msgstr "" - -#: ../../content/applications/finance/expenses.rst:164 -msgid "See how you can easily manage the payment process in Odoo:" +"Click the new :guilabel:`Attach Receipt` button, and a file explorer " +"appears. Navigate to the receipt to be attached, and click :guilabel:`Open`." +" A new :guilabel:`Receipts` smart button appears at the top, and the new " +"receipt is recorded in the chatter. More than one receipt can be attached to" +" an individual expense, as needed. The number of receipts attached to the " +"expense will be noted on the smart button." msgstr "" #: ../../content/applications/finance/expenses.rst:166 -msgid ":doc:`accounting/payments/pay_checks`" +msgid "Automatically create new expenses from an email" msgstr "" -#: ../../content/applications/finance/expenses.rst:167 -msgid ":doc:`accounting/payments/pay_sepa`" +#: ../../content/applications/finance/expenses.rst:168 +msgid "" +"Instead of individually creating each expense in the *Expenses* app, " +"expenses can be automatically created by sending an email to an email alias." msgstr "" #: ../../content/applications/finance/expenses.rst:171 -msgid "How to re-invoice expenses to your customers" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:173 msgid "" -"If you track expenses on customer projects, you can charge them back to your" -" customers automatically." +"To do so, first, an email alias needs to be configured. Go to " +":menuselection:`Expenses app --> Configuration --> Settings`. Ensure " +":guilabel:`Incoming Emails` is checked off." msgstr "" -#: ../../content/applications/finance/expenses.rst:177 +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Create the domain alias by clicking the link." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:179 +msgid "" +"If the domain alias needs to be set up, :guilabel:`Setup your domain alias` " +"will appear beneath the incoming emails check box instead of the email " +"address field. Refer to this documentation for setup instructions and more " +"information: :doc:`/administration/maintain/domain_names`. Once the domain " +"alias is configured, the email address field will be visible beneath the " +"incoming emails section." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:185 +msgid "" +"Next, enter the email address to be used in the email field, then click " +":guilabel:`Save`. Now that the email address has been entered, emails can be" +" sent to that alias to create new expenses without having to be in the Odoo " +"database." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:189 +msgid "" +"To submit an expense via email, create a new email and enter the product's " +"*internal reference* code (if available) and the amount of the expense in " +"the email subject. Next, attach the receipt to the email. Odoo creates the " +"expense by taking the information in the email subject and combining it with" +" the receipt." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:194 +msgid "" +"To check an expense product's internal reference, go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. If an " +"internal reference is listed on the product, it is visible in this view as " +":guilabel:`(Ref###)`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Internal reference numbers are listed in the main Expense Products view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:202 +msgid "" +"To add an internal reference on an expense product, click on the product, " +"then click :guilabel:`Edit`. In edit mode, enter the :guilabel:`Internal " +"Reference` in the field. Beneath the :guilabel:`Internal Reference` field, " +"this sentence appears: :guilabel:`Use this reference as a subject prefix " +"when submitting by email.`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:212 +msgid "" +"For security purposes, only authenticated employee emails are accepted by " +"Odoo when creating an expense from an email. To confirm an authenticated " +"employee email address, go to the employee card in the :guilabel:`Employees`" +" app, and refer to the :guilabel:`Work Email` in the main field." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:221 +msgid "" +"If submitting an expense via email for a $25.00 meal during a work trip, the" +" email subject would be `Ref005 Meal $25.00`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:224 +msgid "Explanation:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:226 +msgid "" +"The :guilabel:`Internal Reference` for the expense product `Meals` is " +"`Ref005`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:227 +msgid "The :guilabel:`Cost` for the expense is `$25.00`" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:230 +msgid "Create an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:232 +msgid "" +"When expenses are ready to submit (such as at the end of a business trip, or" +" once a month), an *expense report* needs to be created. Go to the main " +":menuselection:`Expenses` app dashboard, which displays a default " +":guilabel:`My Expenses` view, or go to :menuselection:`Expenses app --> My " +"Expenses --> My Expenses to Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:237 +msgid "" +"First, each individual expense for the report must be selected by clicking " +"the check box next to each entry, or quickly select all the expenses in the " +"list by clicking the check box next to :guilabel:`Expense Date`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the expenses to submit, then create the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:245 +msgid "" +"Once the expenses have been selected, click the :guilabel:`Create Report` " +"button. The new report appears with all the expenses listed, and the number " +"of documents is visible in the :guilabel:`Documents` smart button." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:249 +msgid "" +"It is recommended to add a short summary for each report to help keep " +"expenses organized. Click the :guilabel:`Edit` button, and the " +":guilabel:`Expense Report Summary` field appears. Enter a short description " +"for the expense report (such as `Client Trip NYC`, or `Repairs for Company " +"Car`). Next, select a :guilabel:`Manager` from the drop-down menu to assign " +"a manager to review the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Enter a short description and select a manager for the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:258 +msgid "" +"If some expenses are not on the report that should be, they can still be " +"added. Click :guilabel:`Add a line` at the bottom of the :guilabel:`Expense`" +" tab. Click the check box next to each expense to add, then click " +":guilabel:`Select`. The items now appear on the report that was just " +"created." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Add more expenses to the report before submitting." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:267 +msgid "" +":guilabel:`Add a line` only appears when the document is in edit mode. It " +"does not appear otherwise." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:270 +msgid "When all edits have been completed, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:273 +msgid "Submit an expense report" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:275 +msgid "" +"When an expense report is completed, the next step is to submit the report " +"to a manager for approval. Reports must be individually submitted, and " +"cannot be submitted in batches. Open the specific report from the list of " +"expense reports (if the report is not already open). To view all expense " +"reports, go to :menuselection:`Expenses app --> My Expenses --> My Reports`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:280 +msgid "" +"If the list is large, grouping the results by status may be helpful since " +"only reports that are in a :guilabel:`Draft` mode need to be submitted, " +"reports with an :guilabel:`Approved` or :guilabel:`Submitted` status do not." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Submit the report to the manager." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:289 +msgid "" +"The status of each report is shown in the :guilabel:`Status` column on the " +"far right. If the :guilabel:`Status` column is not visible, click the " +":guilabel:`⋮ (additional options)` icon at the end of the row, and check the" +" box next to :guilabel:`Status`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:293 +msgid "" +"Click on a report to open it, then click :guilabel:`Submit To Manager`. " +"After submitting a report, the next step is to wait for the manager to " +"approve it." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:297 +msgid "" +"The :ref:`expenses/approve`, :ref:`expenses/post`, and " +":ref:`expenses/reimburse` sections are **only** for users with the " +"*necessary rights*." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:303 +msgid "Approve expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:305 +msgid "" +"In Odoo, not just anyone can approve expense reports— only users with the " +"necessary rights (or permissions) can. This means that a user must have at " +"least *Team Approver* rights for the *Expenses* app. Employees with the " +"necessary rights can review expense reports, and approve or reject them, as " +"well as provide feedback thanks to the integrated communication tool." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:310 +msgid "" +"To see who has rights to approve, go to the main :menuselection:`Settings` " +"app and click on :guilabel:`Manage Users`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:314 +msgid "" +"If the *Settings* app is not available, then certain rights are not set on " +"the account. In the :guilabel:`Access Rights` tab of a user's card in the " +":menuselection:`Settings` app, the :guilabel:`Administration` section is set" +" to one of three options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:318 +msgid "" +":guilabel:`None (blank)`: The user cannot access the *Settings* app at all." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:319 +msgid "" +":guilabel:`Access Rights`: The user can only view the :guilabel:`User's & " +"Companies` section of the *Settings* app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:321 +msgid "" +":guilabel:`Settings`: The user has access to the entire *Settings* app with " +"no restrictions." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:323 +msgid "" +"Please refer to :doc:`this document " +"</applications/general/users/manage_users>` to learn more about managing " +"users and their access rights." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:326 +msgid "" +"Click on an individual to view their card, which displays the " +":guilabel:`Access Rights` tab in the default view. Scroll down to the " +":guilabel:`Human Resources` section. Under :guilabel:`Expenses`, there are " +"four options:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:330 +msgid "" +":guilabel:`None (blank)`: A blank field means the user has no rights to view" +" or approve expense reports, and can only view their own." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:332 +msgid "" +":guilabel:`Team Approver`: The user can only view and approve expense " +"reports for their own specific team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:334 +msgid "" +":guilabel:`All Approver`: The user can view and approve any expense report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:335 +msgid "" +":guilabel:`Administrator`: The user can view and approve any expense report " +"as well as access the reporting and configuration menus in the *Expenses* " +"app." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:338 +msgid "" +"Users who are able to approve expense reports (typically managers) can " +"easily view all expense reports to validate. Go to :menuselection:`Expenses " +"app --> Expense Reports --> Reports to Approve`. This view lists all the " +"expense reports that have been submitted but not approved, as noted by the " +":guilabel:`Submitted` tag in the status column." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Reports to validate are found on the Reports to Approve page." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:347 +msgid "" +"Reports can be approved in two ways (individually or several at once) and " +"refused only one way. To approve multiple expense reports at once, remain in" +" the list view. First, select the reports to approve by clicking the check " +"box next to each report, or click the box next to :guilabel:`Employee` to " +"select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Approve Report`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Approve multiple reports by clicking the checkboxes next to each report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:357 +msgid "" +"To approve an individual report, click on a report to go to a detailed view " +"of that report. In this view, several options are presented: " +":guilabel:`Approve`, :guilabel:`Refuse`, or :guilabel:`Reset to draft`. " +"Click :guilabel:`Approve` to approve the report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:361 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +#: ../../content/applications/finance/expenses.rst:0 +msgid "Send messages in the chatter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:368 +msgid "" +"Team managers can easily view all the expense reports for their team " +"members. While in the :guilabel:`Reports to Approve` view, click on " +":guilabel:`Filters`, then click :guilabel:`My Team`. This presents all the " +"reports for the manager's team." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Select the My Team filter." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:377 +msgid "" +"If more information is needed, such as a receipt is missing, communication " +"is easy from the chatter. In an individual report, simply type in a message," +" tagging the proper person (if needed), and post it to the chatter by " +"clicking :guilabel:`Send`. The message is posted in the chatter, and the " +"person tagged will be notified via email of the message, as well as anyone " +"following." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:390 +msgid "Post expenses in accounting" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:392 +msgid "" +"Once an expense report is approved, the next step is to post the report to " +"the accounting journal. To view all expense reports to post, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Post`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to post by clicking on expense reports, then reports to post." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:400 +msgid "" +"Just like approvals, expense reports can be posted in two ways (individually" +" or several at once). To post multiple expense reports at once, remain in " +"the list view. First, select the reports to post by clicking the check box " +"next to each report, or click the box next to :guilabel:`Employee` to select" +" all reports in the list. Next, click on the :guilabel:`⚙️ Action (gear)` " +"icon, then click :guilabel:`Post Entries`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "Post multiple reports from the Post Entries view." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:410 +msgid "" +"To post an individual report, click on a report to go to the detailed view " +"of that report. In this view, several options are presented: :guilabel:`Post" +" Journal Entries`, :guilabel:`Report In Next Payslip`, or " +":guilabel:`Refuse`. Click :guilabel:`Post Journal Entries` to post the " +"report." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:414 +msgid "" +"If :guilabel:`Refuse` is clicked, a pop-up window appears. Enter a brief " +"explanation for the refusal in the :guilabel:`Reason to refuse Expense` " +"field, then click :guilabel:`Refuse`. Refused reports can be viewed by going" +" to :menuselection:`Expenses app --> Expense Reports --> All Reports`. This" +" list shows all reports, including the refused ones." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:420 +msgid "" +"To post expense reports to an accounting journal, the user must have " +"following access rights:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:422 +msgid "Accounting: Accountant or Adviser" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:423 +msgid "Expenses: Manager" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:428 +msgid "Reimburse employees" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:430 +msgid "" +"After an expense report is posted to an accounting journal, the next step is" +" to reimburse the employee. To view all expense reports to pay, go to " +":menuselection:`Expenses --> Expense Reports --> Reports To Pay`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"View reports to pay by clicking on expense reports, then reports to pay." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:438 +msgid "" +"Just like approvals and posting, expense reports can be paid in two ways " +"(individually or several at once). To pay multiple expense reports at once, " +"remain in the list view. First, select the reports to pay by clicking the " +"check box next to each report, or click the box next to :guilabel:`Employee`" +" to select all reports in the list. Next, click on the :guilabel:`⚙️ Action " +"(gear)` icon, then click :guilabel:`Register Payment`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Post multiple reports by clicking the checkboxes, clicking the gear, then " +"post the entries." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:448 +msgid "" +"To pay an individual report, click on a report to go to a detailed view of " +"that report. Click :guilabel:`Register Payment` to pay the employee." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:452 +msgid "Re-invoice expenses to customers" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:454 +msgid "" +"If expenses are tracked on customer projects, expenses can be automatically " +"charged back to the customer. This is done by creating an expense report, " +"then creating a sales order with the expensed items on it. Then, managers " +"approve the expense report, and the accounting department posts the journal " +"entries. Finally, the customer is invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:460 #: ../../content/applications/finance/fiscal_localizations/india.rst:55 #: ../../content/applications/finance/fiscal_localizations/india.rst:195 msgid "Setup" msgstr "設定" -#: ../../content/applications/finance/expenses.rst:179 -msgid "Enable **Customer Billing** in the Expenses settings" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:181 +#: ../../content/applications/finance/expenses.rst:462 msgid "" -"Go to the product configuration menu and set the invoicing method on all " -"your Expense types:" +"First, specify the invoicing policy for each expense product. Go to " +":menuselection:`Expenses app --> Configuration --> Expense Products`. Click " +"on the expense product to edit, then click :guilabel:`Edit`. Under the " +":guilabel:`Invoicing` section, select the :guilabel:`Invoicing Policy` and " +":guilabel:`Re-Invoicing Policy` by clicking the radio button next to the " +"desired selection." msgstr "" -#: ../../content/applications/finance/expenses.rst:184 +#: ../../content/applications/finance/expenses.rst:467 +msgid ":guilabel:`Invoicing Policy`:" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:469 msgid "" -"Ordered quantities: it will invoice expenses based on the ordered quantity" +":guilabel:`Ordered quantities`: Expense product will only invoice expenses " +"based on the ordered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:187 +#: ../../content/applications/finance/expenses.rst:471 msgid "" -"Delivered quantities: it will invoice expenses based on the expenses " -"quantity" +":guilabel:`Delivered quantities`: Expense product will only invoice expenses" +" based on the delivered quantity." msgstr "" -#: ../../content/applications/finance/expenses.rst:190 -msgid "At cost: will invoice expenses at their real cost." +#: ../../content/applications/finance/expenses.rst:474 +msgid ":guilabel:`Re-Invoicing Policy`:" msgstr "" -#: ../../content/applications/finance/expenses.rst:192 +#: ../../content/applications/finance/expenses.rst:476 +msgid ":guilabel:`No`: Expense product will not be re-invoiced." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:477 msgid "" -"At sales price: will invoice based on a fixed sales price set on the sale " -"order." +":guilabel:`At cost`: Expense product will invoice expenses at their real " +"cost." msgstr "" -#: ../../content/applications/finance/expenses.rst:199 -msgid "Create an order" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:201 +#: ../../content/applications/finance/expenses.rst:478 msgid "" -"As a salesman, create and confirm a Sales Order for the services delivered " -"to your customer. If you don't put any expense in the order, it will be " -"added automatically once posted by the accountant." +":guilabel:`At sales price`: Expense product will invoice the price set on " +"the sale order." msgstr "" -#: ../../content/applications/finance/expenses.rst:206 -msgid "Link the expense to the Sale Order." +#: ../../content/applications/finance/expenses.rst:481 +msgid "Create an expense" msgstr "" -#: ../../content/applications/finance/expenses.rst:212 -msgid "Submit, validate and post expenses" -msgstr "" - -#: ../../content/applications/finance/expenses.rst:214 +#: ../../content/applications/finance/expenses.rst:483 msgid "" -"As a manager, make sure the analytic account is set on every expense line on" -" approving expenses reports. Click the line to add one if missing. Employees" -" are already able to set one when submitting." +"First, when :ref:`creating a new expense <expenses/new>`, the correct " +"information needs to be entered in order to re-invoice a customer. Select " +"the :guilabel:`Customer to Reinvoice` from the drop-down menu. Next, select " +"the :guilabel:`Analytic Account` the expense will be posted to." msgstr "" -#: ../../content/applications/finance/expenses.rst:221 -msgid "As an accountant, post journal entries." +#: ../../content/applications/finance/expenses.rst-1 +msgid "Ensure the customer to be invoiced is called out on the expense." msgstr "" -#: ../../content/applications/finance/expenses.rst:224 +#: ../../content/applications/finance/expenses.rst:492 +msgid "Create a quote and sales order" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:494 +msgid "" +"In the :menuselection:`Sales` app, create a quote for the customer being " +"invoiced, listing the expense products. First, click :guilabel:`Create` to " +"create a new quotation. Next, select the :guilabel:`Customer` being invoiced" +" for the expenses from the drop-down menu." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:498 +msgid "" +"In the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`. In the " +":guilabel:`Product` field, select the first item being invoiced from the " +"drop-down menu, or type in the product name. Then, update the " +":guilabel:`Quantity`, the :guilabel:`Delivered` quantity, and the " +":guilabel:`Unit Price` if needed. Repeat this for all products being " +"invoiced. When all the products have been added to the quote, click " +":guilabel:`Confirm` and the quotation becomes a sales order." +msgstr "" + +#: ../../content/applications/finance/expenses.rst-1 +msgid "" +"Create and confirm the sales order with the expenses listed as products." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:508 +msgid "" +"Once the quote turns into a sales order, a :guilabel:`Delivered` column " +"appears. The delivered quantity must be updated for each item. Click on the " +"`0.000` field for each product, and enter the delivered quantity. When all " +"delivered quantities have been entered, click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:513 +msgid "Validate and post expenses" +msgstr "" + +#: ../../content/applications/finance/expenses.rst:515 +msgid "" +"Only employees with permissions (typically managers or supervisors) can " +":ref:`approve expenses <expenses/approve>`. Before approving an expense " +"report, ensure the :guilabel:`Analytic Account` is set on every expense line" +" of a report. If an :guilabel:`Analytic Account` is missing, click " +":guilabel:`Edit` and select the correct account from the drop-down menu, " +"then click :guilabel:`Approve` or :guilabel:`Refuse`." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:521 +msgid "" +"The accounting department is typically responsible for :ref:`posting journal" +" entries <expenses/post>`. Once an expense report is approved, it can then " +"be posted." +msgstr "" + +#: ../../content/applications/finance/expenses.rst:525 msgid "Invoice expenses" msgstr "" -#: ../../content/applications/finance/expenses.rst:226 +#: ../../content/applications/finance/expenses.rst:527 msgid "" -"Now you can invoice the order. It shows up in :menuselection:`Sales --> " -"Invoicing --> Sales` to Invoice. The expenses have been added automatically " -"in the order lines. Such items show up in blue (i.e. to invoice)." +"Once the quote has turned into a sales order, and the expense report has " +"been approved, it is time to invoice the customer. Go to " +":menuselection:`Sales app --> To Invoice --> Orders to Invoice` to view the " +"sales orders ready to be invoiced." msgstr "" -#: ../../content/applications/finance/expenses.rst:234 -msgid "e (i.e. to invoice)." +#: ../../content/applications/finance/expenses.rst:531 +msgid "" +"Next, find the sales order related to the expense report, click into it, and" +" then click :guilabel:`Create Invoice` and a :guilabel:`Create invoices` " +"pop-up window appears. Select if the invoice is a :guilabel:`Regular " +"invoice`, :guilabel:`Down payment (percentage)`, or :guilabel:`Down payment " +"(fixed amount)` by clicking the radio button next to the selection. For " +"either down payment options, enter the amount (fixed or percentage) in the " +":guilabel:`Down Payment Amount` field. Finally, click either " +":guilabel:`create and view invoice` or :guilabel:`create invoice`." msgstr "" #: ../../content/applications/finance/fiscal_localizations.rst:5 @@ -15390,10 +16053,6 @@ msgstr "" msgid "Enter the perception amount." msgstr "" -#: ../../content/applications/finance/fiscal_localizations/argentina.rst:679 -msgid "Reports" -msgstr "報表" - #: ../../content/applications/finance/fiscal_localizations/argentina.rst:681 msgid "" "As part of the localization installation, financial reporting for Argentina " @@ -24239,7 +24898,7 @@ msgid "" "works with the following PACs: `Solución Factible " "<https://solucionfactible.com/>`_, `Quadrum (formerly Finkok) " "<https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:37 @@ -24539,7 +25198,7 @@ msgid "" "you start creating invoices from Odoo. We have the following PACs available:" " `Quadrum <https://cfdiquadrum.com.mx/index.html>`_, `Solución Factible " "<https://solucionfactible.com/>`_ and `SW Sapien - Smarter Web " -"<https://sw.com.mx/>`_." +"<https://info.sw.com.mx/sw-smarter-odoo/>`_." msgstr "" #: ../../content/applications/finance/fiscal_localizations/mexico.rst:216 @@ -29063,7 +29722,6 @@ msgstr "" #: ../../content/applications/finance/payment_providers/authorize.rst:15 #: ../../content/applications/finance/payment_providers/buckaroo.rst:31 #: ../../content/applications/finance/payment_providers/mollie.rst:14 -#: ../../content/applications/finance/payment_providers/paypal.rst:17 #: ../../content/applications/finance/payment_providers/sips.rst:15 msgid "Credentials tab" msgstr "" @@ -29286,14 +29944,14 @@ msgstr "" #: ../../content/applications/finance/payment_providers/demo.rst:12 #: ../../content/applications/finance/payment_providers/mollie.rst:11 #: ../../content/applications/finance/payment_providers/ogone.rst:9 -#: ../../content/applications/finance/payment_providers/paypal.rst:14 +#: ../../content/applications/finance/payment_providers/paypal.rst:93 #: ../../content/applications/finance/payment_providers/sips.rst:12 #: ../../content/applications/finance/payment_providers/stripe.rst:12 msgid ":ref:`payment_providers/add_new`" msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:10 -#: ../../content/applications/finance/payment_providers/adyen.rst:146 +#: ../../content/applications/finance/payment_providers/adyen.rst:163 #: ../../content/applications/finance/payment_providers/alipay.rst:39 #: ../../content/applications/finance/payment_providers/asiapay.rst:41 #: ../../content/applications/finance/payment_providers/authorize.rst:53 @@ -29301,7 +29959,7 @@ msgstr "" #: ../../content/applications/finance/payment_providers/flutterwave.rst:44 #: ../../content/applications/finance/payment_providers/mercado_pago.rst:30 #: ../../content/applications/finance/payment_providers/mollie.rst:31 -#: ../../content/applications/finance/payment_providers/paypal.rst:141 +#: ../../content/applications/finance/payment_providers/paypal.rst:157 #: ../../content/applications/finance/payment_providers/razorpay.rst:46 #: ../../content/applications/finance/payment_providers/sips.rst:32 #: ../../content/applications/finance/payment_providers/stripe.rst:142 @@ -29375,26 +30033,36 @@ msgstr "" #: ../../content/applications/finance/payment_providers/adyen.rst:48 msgid "" "In order to retrieve the API Key and the Client Key, log into your Adyen " -"account, go to :menuselection:`Developers --> API Credentials`. - If you " -"already have an API user, open it. - If you don't have an API user yet, " -"click on **Create new credential**. Go to :menuselection:`Server settings " -"--> Authentification` and copy or generate your **API Key**. Be careful to " -"copy your API key as you'll not be allowed to get it later without " -"generating a new one." +"account, go to :menuselection:`Developers --> API Credentials`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:56 +#: ../../content/applications/finance/payment_providers/adyen.rst:51 +msgid "If you already have an API user, open it." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:52 +msgid "If you don't have an API user yet, click on **Create new credential**." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:54 +msgid "" +"Go to :menuselection:`Server settings --> Authentification` and copy or " +"generate your **API Key**. Be careful to copy your API key as you'll not be " +"allowed to get it later without generating a new one." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:58 msgid "" "Now, head to :menuselection:`Client settings --> Authentification` and cody " "or generate your **Client Key**. This is also the place where you can " ":ref:`allow payments to be made from your website <adyen/allowed_origins>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:63 +#: ../../content/applications/finance/payment_providers/adyen.rst:65 msgid "HMAC key" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:65 +#: ../../content/applications/finance/payment_providers/adyen.rst:67 msgid "" "In order to retrieve the HMAC Key, you'll need to configure a `Standard " "Notification` webhook. For this, log into your Adyen account then go to " @@ -29406,7 +30074,7 @@ msgstr "" msgid "Configure a webhook." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:73 +#: ../../content/applications/finance/payment_providers/adyen.rst:75 msgid "" "There, in :menuselection:`General --> Server configuration --> URL`, enter " "your server address followed by `/payment/adyen/notification`." @@ -29416,7 +30084,7 @@ msgstr "" msgid "Enter the notification URL." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:80 +#: ../../content/applications/finance/payment_providers/adyen.rst:82 msgid "" "Then enter :menuselection:`Security --> HMAC Key --> Generate`. Be careful " "to copy the key as you will not be allowed to do it later without generating" @@ -29427,36 +30095,80 @@ msgstr "" msgid "Generate a HMAC key and save it." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:87 +#: ../../content/applications/finance/payment_providers/adyen.rst:89 msgid "You have to save the webhook to finalize its creation." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:92 -msgid "URLs" -msgstr "" - #: ../../content/applications/finance/payment_providers/adyen.rst:94 +msgid "API URLs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:96 msgid "" -"To retrieve the URLs, log into your Adyen account, go to " -":menuselection:`Developers --> API URLs`. Select one of the URLs listed next" -" to :guilabel:`Classic Recurring API` as your :guilabel:`Recurring API URL` " -"and one listed next to :guilabel:`Checkout API` as your :guilabel:`Checkout " -"API URL`." +"All Adyen API URLs include a customer area-specific prefix generated by " +"Adyen. To configure the URLs, proceed as follows:" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst-1 -msgid "Get the links for the different API." +#: ../../content/applications/finance/payment_providers/adyen.rst:99 +msgid "" +"Log into your Adyen account, then go to :menuselection:`Developers --> API " +"URLs`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:104 +#: ../../content/applications/finance/payment_providers/adyen.rst:100 +msgid "" +"Copy the :guilabel:`Prefix` for your live Customer area (i.e., **data " +"center**) and save it for later." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:0 +msgid "Copy the prefix for the Adyen APIs" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:106 +msgid "" +"In Odoo, :ref:`navigate to the payment provider Adyen " +"<payment_providers/add_new>`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:107 +msgid "" +"In the :guilabel:`Checkout API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-checkout-live.adyenpayments.com/checkout`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:110 +msgid "" +"In the :guilabel:`Recurring API URL` field, enter the following URL and " +"replace `yourprefix` with the prefix you previously saved: " +"`https://yourprefix-pal-live.adyenpayments.com/pal/servlet/Recurring`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:115 +msgid "" +"If you are trying Adyen as a test, you can use the following URLs instead:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:117 +msgid ":guilabel:`Checkout API URL`: `https://checkout-test.adyen.com`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:118 +msgid "" +":guilabel:`Recurring API URL`: `https://pal-" +"test.adyen.com/pal/servlet/Recurring`" +msgstr "" + +#: ../../content/applications/finance/payment_providers/adyen.rst:121 msgid "Adyen Account" msgstr "Adyen 帳號" -#: ../../content/applications/finance/payment_providers/adyen.rst:109 +#: ../../content/applications/finance/payment_providers/adyen.rst:126 msgid "Allow payments from a specific origin" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:111 +#: ../../content/applications/finance/payment_providers/adyen.rst:128 msgid "" "To allow payment originated from your website, follow the steps in " ":ref:`adyen/api_and_client_keys` to navigate to your API user and go to " @@ -29468,26 +30180,26 @@ msgstr "" msgid "Allows payments originated from a specific domain." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:120 +#: ../../content/applications/finance/payment_providers/adyen.rst:137 #: ../../content/applications/finance/payment_providers/authorize.rst:43 #: ../../content/applications/finance/payment_providers/stripe.rst:124 msgid "Place a hold on a card" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:122 +#: ../../content/applications/finance/payment_providers/adyen.rst:139 msgid "" "Adyen allows you to capture an amount manually instead of having an " "immediate capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:124 +#: ../../content/applications/finance/payment_providers/adyen.rst:141 msgid "" "To set it up, enable the **Capture Amount Manually** option on Odoo, as " "explained in the :ref:`payment providers documentation " "<payment_providers/features/manual_capture>`." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:127 +#: ../../content/applications/finance/payment_providers/adyen.rst:144 msgid "" "Then, open your Adyen Merchant Account, go to :menuselection:`Account --> " "Settings`, and set the **Capture Delay** to **manual**." @@ -29497,21 +30209,21 @@ msgstr "" msgid "Capture Delay settings in Adyen" msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:135 +#: ../../content/applications/finance/payment_providers/adyen.rst:152 msgid "" "If you configure Odoo to capture amounts manually, make sure to set the " "**Capture Delay** to **manual** on Adyen. Otherwise, the transaction will be" " blocked in the authorized state in Odoo." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:138 +#: ../../content/applications/finance/payment_providers/adyen.rst:155 msgid "" "Odoo doesn't support the partial capture yet. Be aware that if you make a " "partial capture from Adyen's interface, Odoo will manage it as if it was a " "full capture." msgstr "" -#: ../../content/applications/finance/payment_providers/adyen.rst:142 +#: ../../content/applications/finance/payment_providers/adyen.rst:159 msgid "" "After **7 days**, if the transaction hasn't been captured yet, the customer " "has the right to **revoke** it." @@ -30314,7 +31026,7 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/ogone.rst:103 -#: ../../content/applications/finance/payment_providers/paypal.rst:11 +#: ../../content/applications/finance/payment_providers/paypal.rst:90 msgid "Settings in Odoo" msgstr "" @@ -30328,183 +31040,131 @@ msgid "" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:3 -msgid "Paypal" -msgstr "Paypal" +msgid "PayPal" +msgstr "PayPal" #: ../../content/applications/finance/payment_providers/paypal.rst:5 msgid "" -"`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It " -"doesn't charge any subscription fee, and creating an account is very easy. " -"That's why we recommend it for starters in Odoo. It works as a seamless flow" -" where the customer is routed to the Paypal website to register the payment." +"`Paypal <https://www.paypal.com/>`_ is an American online payment provider " +"available worldwide, and one of the few that does not charge a subscription " +"fee." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:9 +msgid "Settings in PayPal" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:11 +msgid "" +"To access your PayPal account settings, log into PayPal, open the " +":guilabel:`Account Settings`, and open the :guilabel:`Website payments` " +"menu." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst-1 +msgid "PayPal account menu" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:19 msgid "" -"Odoo needs your **API Credentials** to connect with your PayPal account, " -"which comprise:" +"Note that for PayPal to work **in Odoo**, the options :ref:`Auto Return " +"<paypal/auto-return>`, :ref:`PDT <paypal/pdt>`, and :ref:`IPN <paypal/ipn>` " +"**must** all be enabled." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:21 -msgid "**Email**: your login email address in Paypal." +#: ../../content/applications/finance/payment_providers/paypal.rst:25 +msgid "Auto Return" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:22 +#: ../../content/applications/finance/payment_providers/paypal.rst:27 msgid "" -"**PDT Identity Token**: the key used to verify the authenticity of " -"transactions." +"The **Auto Return** feature automatically redirects customers to Odoo once " +"the payment is processed." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:23 +#: ../../content/applications/finance/payment_providers/paypal.rst:29 msgid "" -"**Use IPN**: whether you want to use Instant Payment Notification. Already " -"checked, you don't have to change it." +"From :guilabel:`Website payments`, go to :menuselection:`Website preferences" +" --> Update --> Auto return for website payments --> Auto return` and select" +" :guilabel:`On`. Enter the address of your Odoo database (e.g., " +"`https://yourcompany.odoo.com`) in the :guilabel:`Return URL` field, and " +":guilabel:`Save`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:26 +#: ../../content/applications/finance/payment_providers/paypal.rst:35 msgid "" -"You can copy your credentials from your Paypal account and paste them into " -"the related fields under the **Credentials** tab." +"Any URL does the job. Odoo only needs the setting to be enabled since it " +"uses another URL." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:30 +#: ../../content/applications/finance/payment_providers/paypal.rst:40 +msgid "Payment Data Transfer (PDT)" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:42 msgid "" -"To set the **PDT Identity Token**, switch to :ref:`developer mode " -"<developer-mode>` and retrieve the token by following the configuration step" -" :ref:`paypal/enable-pdt`." +":abbr:`PDT (Payment Data Transfer)` allows to receive payment confirmations," +" displays the payment status to the customers, and verifies the authenticity" +" of the payments. From :menuselection:`Website preferences --> Update`, " +"scroll down to :guilabel:`Payment data transfer` and select :guilabel:`On`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:34 +#: ../../content/applications/finance/payment_providers/paypal.rst:47 msgid "" -"If you are trying Paypal as a test, using a :ref:`Paypal Sandbox account " -"<paypal/testing>`, change the **State** to *Test Mode*. We recommend doing " -"this on a test Odoo database rather than on your main database." +"PayPal displays your **PDT Identity Token** as soon as :ref:`Auto return " +"<paypal/auto-return>` and :ref:`Payment Data Transfer (PDT) <paypal/pdt>` " +"are enabled. If you need the **PDT Identity Token**, disable and re-enable " +":guilabel:`Payment data transfer` to display the token again." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:39 -msgid "Fees tab" +#: ../../content/applications/finance/payment_providers/paypal.rst:54 +msgid "Instant Payment Notification (IPN)" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:41 +#: ../../content/applications/finance/payment_providers/paypal.rst:56 msgid "" -"You can charge extra fees to your customers for paying with Paypal to cover " -"the transaction fees Paypal charges you. Once redirected to Paypal, your " -"customer sees an extra amount applied to the order amount." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:45 -msgid "" -"To activate this, go to Paypal configuration's :guilabel:`Fees` tab in Odoo " -"and activate :guilabel:`Add Extra Fees`." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:48 -msgid "" -"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" -"fees>`_ to set up fees." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:51 -msgid "" -"`Traders in the EU " -"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/ " -"index_en.htm>`_ are not allowed to charge extra fees for paying with credit " -"cards." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:55 -msgid "Settings in Paypal" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:57 -msgid "" -"First, set up your Paypal account to build a seamless customer experience " -"with Odoo." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:59 -msgid "" -"Log into your PayPal account and open the account settings. Then, go to " -":menuselection:`Account menu --> Account settings --> Website payments`." +":abbr:`IPN (Instant Payment Notifications)` is similar to **PDT**, but " +"allows for more notifications, such as chargeback notifications. To enable " +"**IPN**, go to :menuselection:`Website payments --> Instant payment " +"notifications --> Update` and click :guilabel:`Choose IPN settings`. Enter a" +" :guilabel:`Notification URL`, select :guilabel:`Receive IPN messages " +"(Enabled)`, and :guilabel:`Save`." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:63 -msgid "Enable Auto Return" +msgid "PayPal Account Optional" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:65 msgid "" -"The *Auto Return* feature automatically redirects your customers to Odoo " -"once the payment is processed." +"We advise not to prompt customers to log in with a PayPal account upon " +"payment. It is better and more accessible for customers to pay with a " +"debit/credit card. To disable that prompt, go to :menuselection:`Account " +"Settings --> Website payments --> Update` and select :guilabel:`On` for " +":guilabel:`PayPal account optional`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:68 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Auto return for website payments` and select " -"**On**. Enter the address of your Odoo database (e.g., " -"`https://yourcompany.odoo.com`) in the **Return URL** field." +#: ../../content/applications/finance/payment_providers/paypal.rst:71 +msgid "Payment Messages Format" msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:73 msgid "" -"Any URL will do the job. Odoo only needs the setting to be enabled since it " -"uses another URL." +"If you use accented characters (or anything other than primary Latin " +"characters) for customer names or addresses, then you **must** configure the" +" encoding format of the payment request sent by Odoo to PayPal. If you do " +"not, some transactions fail without notice." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:78 -msgid "Enable Payment Data Transfer (PDT)" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:80 -msgid "" -"Enable the *Payment Data Transfer* feature to receive payment confirmations " -"immediately. This feature also displays the payment status to the customers " -"and verifies the authenticity of the payments." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:84 -msgid "" -"From the *Website payments* settings page, go to :menuselection:`Website " -"preferences --> Update --> Payment data transfer` and select **On**. PayPal " -"displays your **PDT Identity Token** as soon as the change is saved." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:89 -msgid "Paypal Account Optional" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:91 -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 "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:96 -msgid "Payment Messages Format" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:98 -msgid "" -"Suppose you use accented characters (or anything else than primary Latin " -"characters) for your customer names or addresses. In that case, you **must**" -" configure the encoding format of the payment request sent by Odoo to " -"Paypal. Otherwise, some transactions fail without notice." -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:102 +#: ../../content/applications/finance/payment_providers/paypal.rst:77 msgid "" "To do so, go to `your production account <https://www.paypal.com/cgi-" -"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click *More" -" Options* and set the two default encoding formats as **UTF-8**." +"bin/customerprofileweb ?cmd=_profile-language-encoding>`_. Then, click " +":guilabel:`More Options` and set the two default encoding formats as " +":guilabel:`UTF-8`." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:106 -msgid "Your Paypal account is ready!" -msgstr "" - -#: ../../content/applications/finance/payment_providers/paypal.rst:109 +#: ../../content/applications/finance/payment_providers/paypal.rst:82 msgid "" "For Encrypted Website Payments & EWP_SETTINGS error, please check the " "`Paypal documentation <https://developer.paypal.com/docs/classic/paypal-" @@ -30512,7 +31172,7 @@ msgid "" "payments-ewp>`_." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:112 +#: ../../content/applications/finance/payment_providers/paypal.rst:85 msgid "" "Configure your :ref:`Paypal Sandbox account <paypal/testing>`, then follow " "this `link <https://sandbox.paypal.com/cgi-" @@ -30520,44 +31180,120 @@ msgid "" "encoding format in a test environment." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:119 -msgid "Test environment" +#: ../../content/applications/finance/payment_providers/paypal.rst:96 +msgid "Credentials" +msgstr "授權認證" + +#: ../../content/applications/finance/payment_providers/paypal.rst:98 +msgid "" +"Odoo needs your **API Credentials** to connect with your PayPal account. To " +"do so, go to :menuselection:`Accounting --> Configuration --> Payment " +"Providers` and :guilabel:`Activate` PayPal. Then, enter your PayPal account " +"credentials in the :guilabel:`Credentials` tab:" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:124 +#: ../../content/applications/finance/payment_providers/paypal.rst:102 +msgid ":guilabel:`Email`: the login email address in Paypal;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:103 msgid "" -"Thanks to Paypal Sandbox accounts, you can test the entire payment flow in " -"Odoo." +":guilabel:`PDT Identity Token`: the key used to verify the authenticity of " +"transactions;" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:104 +msgid ":guilabel:`Use IPN`: enable for PayPal to work properly in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:107 +msgid "Save the :guilabel:`PDT Identity Token` for later use." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:109 +msgid "" +"To set the :guilabel:`PDT Identity Token`, switch to :ref:`developer mode " +"<developer-mode>` and retrieve the token by following the configuration " +"steps at :ref:`paypal/pdt`." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:113 +msgid "The PayPal **Merchant ID** is not required in Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:115 +msgid "" +"If you are trying PayPal as a test, using a :ref:`PayPal Sandbox account " +"<paypal/testing>`, change the :guilabel:`State` to :guilabel:`Test Mode`. We" +" recommend doing this on a test Odoo database rather than on your main " +"database." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:120 +msgid "Extra fees" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:122 +msgid "" +"You can charge :ref:`extra fees <payment_providers/features/extra_fees>` to " +"customers choosing to pay with PayPal in order to cover the transaction fees" +" PayPal charges you." msgstr "" #: ../../content/applications/finance/payment_providers/paypal.rst:126 msgid "" -"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " -"your Paypal credentials, which creates two sandbox accounts:" +"You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-" +"fees>`_ to set up fees." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:129 +#: ../../content/applications/finance/payment_providers/paypal.rst:128 +msgid "" +"`Traders in the EU " +"<https://europa.eu/youreurope/citizens/consumers/shopping/pricing-" +"payments/index_en.htm>`_ are not allowed to charge extra fees for paying " +"with credit cards." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:133 +msgid "Test environment" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:138 +msgid "" +"Thanks to PayPal sandbox accounts, you can test the entire payment flow in " +"Odoo." +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:140 +msgid "" +"Log into the `Paypal Developer Site <https://developer.paypal.com/>`_ using " +"your PayPal credentials, which creates two sandbox accounts:" +msgstr "" + +#: ../../content/applications/finance/payment_providers/paypal.rst:143 msgid "" "A business account (to use as merchants, e.g., " "`pp.merch01-facilitator@example.com " -"<mailto:pp.merch01-facilitator@example.com>`_)." +"<mailto:pp.merch01-facilitator@example.com>`_);" msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:131 +#: ../../content/applications/finance/payment_providers/paypal.rst:145 msgid "" "A default personal account (to use as shoppers, e.g., " "`pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`_)." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:134 +#: ../../content/applications/finance/payment_providers/paypal.rst:148 msgid "" -"Log into Paypal Sandbox using the merchant account and follow the same " -"configuration instructions. Enter your sandbox credentials in Odoo and " -"ensure Paypal is set on *Test Mode*. We recommend doing this on a test Odoo " -"database rather than your main database." +"Log into PayPal sandbox using the merchant account and follow the same " +"configuration instructions. Enter your sandbox credentials in Odoo " +"(:menuselection:`Accounting --> Configuration --> Payment Providers --> " +"PayPal` in the :guilabel:`Credentials` tab, and make sure the status is set " +"on :guilabel:`Test Mode`. We recommend doing this on a test Odoo database " +"rather than your main database." msgstr "" -#: ../../content/applications/finance/payment_providers/paypal.rst:138 +#: ../../content/applications/finance/payment_providers/paypal.rst:154 msgid "Run a test transaction from Odoo using the sandbox personal account." msgstr "" diff --git a/locale/zh_TW/LC_MESSAGES/inventory_and_mrp.po b/locale/zh_TW/LC_MESSAGES/inventory_and_mrp.po index 4e602ad67..a56aa5133 100644 --- a/locale/zh_TW/LC_MESSAGES/inventory_and_mrp.po +++ b/locale/zh_TW/LC_MESSAGES/inventory_and_mrp.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-02 08:43+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:53+0000\n" "Last-Translator: Benson <Benson.Dr@Gmail.com>, 2023\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/odoo/teams/41243/zh_TW/)\n" @@ -4726,8 +4726,8 @@ msgstr "" msgid "" "First, make sure the :guilabel:`Multi-Step Routes` option is enabled in " ":menuselection:`Inventory --> Configuration --> Settings`, under the " -"::guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save`" -" the changes." +":guilabel:`Warehouse` heading. After enabling the setting, :guilabel:`Save` " +"the changes." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:39 @@ -4764,7 +4764,7 @@ msgid "" ":guilabel:`WH/Output`, respectively, on the :guilabel:`Locations` dashboard." " To rename these locations, go to :menuselection:`Configuration --> " "Locations`, select the :guilabel:`Location` to change, and then click " -":guilabel:`Edit`. On the location form, update the ::guilabel:`Location " +":guilabel:`Edit`. On the location form, update the :guilabel:`Location " "Name`, make any other changes (if necessary) and :guilabel:`Save` the " "changes." msgstr "" @@ -4776,8 +4776,8 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:78 msgid "" "For businesses with multiple warehouses that have different step " -"configurations, the :guilabel:`Deliver To` field on the ::abbr:`PO (Purchase" -" Order)` form may need to be specifed as the correct *input location* " +"configurations, the :guilabel:`Deliver To` field on the :abbr:`PO (Purchase " +"Order)` form may need to be specified as the correct *input location* " "connected to the two-step warehouse, which can be done by selecting the " "warehouse from the drop-down selection that includes the `Receipts` label at" " the end of the name." @@ -4785,7 +4785,7 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:84 msgid "" -"After confirming the ::abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " +"After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` " "smart button will appear in the top-right corner of the :abbr:`PO (Purchase " "Order)` form — click it to reveal the associated receipt." msgstr "" @@ -4862,16 +4862,15 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:145 msgid "" "In the :menuselection:`Sales` application, create a new quote by clicking " -":guilabel:`Create`. Select (or create) a :guilabel:`Customer`, add a " -"storable :guilabel:`Product` to the order lines, and then click " -":guilabel:`Confirm`." +":guilabel:`Create`. Select or create a :guilabel:`Customer`, add a storable " +":guilabel:`Product` to the order lines, and then click :guilabel:`Confirm`." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:149 msgid "" -"After confirming the ::abbr:`SO (Sales Order)`, a :guilabel:`Receipt` smart " -"button will appear in the top-right corner of the :abbr:`PO (Sales Order)` " -"form — click it to reveal the associated receipt." +"After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart " +"button will appear in the top-right corner of the :abbr:`SO (Sales Order)` " +"form. Click it to reveal the associated delivery forms." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 @@ -4899,8 +4898,8 @@ msgstr "" msgid "" "The picking and delivery order will be created once the sales order is " "confirmed. When the :guilabel:`Delivery` smart button appears, click it to " -"arrive to the :guilabel:`Transfers` dashboard, which lists both the picking " -"and the delivery orders." +"reveal the :guilabel:`Transfers` dashboard, which lists both the picking and" +" the delivery orders." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:174 @@ -4941,9 +4940,9 @@ msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst:203 msgid "" "The delivery order associated with the :abbr:`SO (Sales Order)` can also be " -"quickly accessed by clicking on the ::guilabel:`Delivery` smart button " -"again, and choosing the delivery order on the ::guilabel:`Transfers` page " -"(which should now be marked as ::guilabel:`Ready`)." +"quickly accessed by clicking on the :guilabel:`Delivery` smart button again," +" and choosing the delivery order on the :guilabel:`Transfers` page (which " +"should now be marked as :guilabel:`Ready`)." msgstr "" #: ../../content/applications/inventory_and_mrp/inventory/management/shipments_deliveries/receipts_delivery_two_steps.rst-1 diff --git a/locale/zh_TW/LC_MESSAGES/sales.po b/locale/zh_TW/LC_MESSAGES/sales.po index 2622fc2ec..0c9d1336f 100644 --- a/locale/zh_TW/LC_MESSAGES/sales.po +++ b/locale/zh_TW/LC_MESSAGES/sales.po @@ -4,19 +4,19 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# 敬雲 林 <chingyun@yuanchih-consult.com>, 2023 # Benson <Benson.Dr@Gmail.com>, 2023 # Tony Ng, 2023 # Martin Trigaux, 2023 +# 敬雲 林 <chingyun@yuanchih-consult.com>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-30 12:32+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" +"Last-Translator: 敬雲 林 <chingyun@yuanchih-consult.com>, 2023\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/odoo/teams/41243/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,6 +75,7 @@ msgstr "" #: ../../content/applications/sales/crm/track_leads/lead_scoring.rst:44 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12 #: ../../content/applications/sales/point_of_sale/configuration.rst:6 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/adyen.rst:13 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/ingenico.rst:12 #: ../../content/applications/sales/point_of_sale/payment_methods/terminals/six.rst:16 @@ -1624,8 +1625,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:26 msgid "" -"Multiple users can be connected to the same session at the same time. " -"However, the session can only be opened once on the same browser." +":doc:`Multiple users <point_of_sale/employee_login>` can be logged into the " +"same session at the same time. However, the session can only be opened once " +"on the same browser." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:32 @@ -1634,9 +1636,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale.rst:34 msgid "" -"Click products to add them to the cart. To change the **quantity**, click " -":guilabel:`Qty` and enter the number of products using the keypad. To add a " -"**discount** or modify the product **price**, click respectively " +"Click on products to add them to the cart. To change the **quantity**, click" +" :guilabel:`Qty` and enter the number of products using the keypad. To add a" +" **discount** or modify the product **price**, click respectively " ":guilabel:`% Disc` or :guilabel:`Price` and enter the amounts." msgstr "" @@ -1663,41 +1665,31 @@ msgid "" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:52 -msgid "Register customers" +msgid "Set customers" msgstr "" #: ../../content/applications/sales/point_of_sale.rst:54 msgid "" -"Registering your customers gives you the ability to grant them various " -"privileges such as discounts, loyalty program, specific communication. It is" -" also required if they want an invoice and registering them makes any future" -" interaction with them faster." +"You can create and set customers from an :ref:`open POS session " +"<pos/session-start>`. Registering your customer is necessary to " +":doc:`collect their loyalty points and grant them rewards " +"<point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed " +"pricelist <point_of_sale/pricing/pricelists>`, or :ref:`generate and print " +"an invoice <receipts-invoices/invoices>`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:58 -msgid "From your session interface, use the customer button." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:62 -msgid "Create a new one by using this button." +#: ../../content/applications/sales/point_of_sale.rst:60 +msgid "" +"To access the list of customers, click :guilabel:`Customer` on the POS " +"interface. Then, select a customer or create a new one by clicking " +":guilabel:`Create`, completing the form, and saving." msgstr "" #: ../../content/applications/sales/point_of_sale.rst:66 -msgid "" -"You will be invited to fill out the customer form with their information." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:71 -msgid "" -"Use the save button when you are done. You can then select that customer in " -"any future transactions." -msgstr "" - -#: ../../content/applications/sales/point_of_sale.rst:77 msgid "Customer notes" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:79 +#: ../../content/applications/sales/point_of_sale.rst:68 msgid "" "You can add **customer notes** about specific products directly from an open" " :ref:`POS session <pos/session-start>`. For instance, to provide cleaning " @@ -1705,14 +1697,14 @@ msgid "" " request, such as not wanting the product to be assembled for them." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:83 +#: ../../content/applications/sales/point_of_sale.rst:72 msgid "" "To do so, select a product and click :guilabel:`Customer Note` on the pad. " "Doing so opens a pop-up window in which you can add or modify content for " "the note." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:87 +#: ../../content/applications/sales/point_of_sale.rst:76 msgid "" "Product notes from an :doc:`imported SO <point_of_sale/shop/sales_order>` " "are displayed identically in the cart." @@ -1723,7 +1715,7 @@ msgid "" "Customer note button and notes (SO and POS session) on products in the cart" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:93 +#: ../../content/applications/sales/point_of_sale.rst:82 msgid "" "Customer notes appear on customers' receipts and invoices similarly to how " "they appear in the cart, under the related product." @@ -1734,37 +1726,37 @@ msgid "" "Customer receipt with notes from an SO and from the customer note feature" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:102 +#: ../../content/applications/sales/point_of_sale.rst:91 msgid "Return and refund products" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:104 +#: ../../content/applications/sales/point_of_sale.rst:93 msgid "To return and refund a product," msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:106 +#: ../../content/applications/sales/point_of_sale.rst:95 msgid ":ref:`start a session <pos/session-start>` from the **POS dashboard**;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:107 +#: ../../content/applications/sales/point_of_sale.rst:96 msgid "click :guilabel:`Refund` and select the corresponding order;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:108 +#: ../../content/applications/sales/point_of_sale.rst:97 msgid "select the product and the quantity to refund using the keypad;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:109 +#: ../../content/applications/sales/point_of_sale.rst:98 msgid "click :guilabel:`Refund` to go back to the previous screen;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:110 +#: ../../content/applications/sales/point_of_sale.rst:99 msgid "" "once the order is completed, click :guilabel:`Payment` to proceed to the " "refund;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:111 +#: ../../content/applications/sales/point_of_sale.rst:100 msgid "" "click :guilabel:`Validate` and :guilabel:`New Order` to move on to the next " "customer." @@ -1774,13 +1766,13 @@ msgstr "" msgid "refund view from a POS" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:117 +#: ../../content/applications/sales/point_of_sale.rst:106 msgid "" "You can filter the **orders list** by :guilabel:`Receipt Number`, " ":guilabel:`Date` or :guilabel:`Customer` using the search bar." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:119 +#: ../../content/applications/sales/point_of_sale.rst:108 msgid "" "You can also refund a product by selecting the returned product from an open" " session, and setting a negative quantity that equals the number of returned" @@ -1788,27 +1780,27 @@ msgid "" "the quantity of returned products." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:126 +#: ../../content/applications/sales/point_of_sale.rst:115 msgid "Close the POS session" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:128 +#: ../../content/applications/sales/point_of_sale.rst:117 msgid "" "To close your session, click :guilabel:`Close` in the upper right corner of " "your screen; doing so opens the :guilabel:`Closing Control` pop-up screen. " "From this screen, you can retrieve various information:" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:132 +#: ../../content/applications/sales/point_of_sale.rst:121 msgid "" "the number of orders made and the total amount made during the session;" msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:133 +#: ../../content/applications/sales/point_of_sale.rst:122 msgid "the expected amounts grouped by payment method." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:135 +#: ../../content/applications/sales/point_of_sale.rst:124 msgid "" "Before closing this window, count your cash using the calculator icon. Doing" " so opens a pop-up window that computes the total amount in the cash drawer " @@ -1822,31 +1814,31 @@ msgstr "" msgid "How to close a POS session." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:144 +#: ../../content/applications/sales/point_of_sale.rst:133 msgid "" "Once you are done controlling the amounts, click :guilabel:`Close Session` " "to close and go back to the **POS dashboard**." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:148 +#: ../../content/applications/sales/point_of_sale.rst:137 msgid "" "You can let the session open by clicking :guilabel:`Backend` or abort and " "keep selling by clicking :guilabel:`Discard`." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:150 +#: ../../content/applications/sales/point_of_sale.rst:139 msgid "" "Depending on your setup, you might only be allowed to close a session if the" " expected cash revenue equals the counted cash. To close it anyway, click " ":guilabel:`Ok` on the :guilabel:`Payments Difference` screen." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:155 +#: ../../content/applications/sales/point_of_sale.rst:144 msgid "" "It is strongly advised to close your POS session at the end of each day." msgstr "" -#: ../../content/applications/sales/point_of_sale.rst:156 +#: ../../content/applications/sales/point_of_sale.rst:145 msgid "" "To look at all your previous sessions, go to :menuselection:`Point of Sale " "--> Orders --> Sessions`." @@ -2401,93 +2393,110 @@ msgid ":doc:`epos_ssc`" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:3 -msgid "Log in with employee" +msgid "Multi-employee management" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:5 msgid "" -"With Odoo *Point of Sale*, you can manage multiple cashiers. This feature " -"allows you to keep track of who is working, when and how much each cashier " -"made for that session." +"Odoo Point of Sale allows you to manage access to a specific POS by enabling" +" the **Multi Employees per Session** feature. When activated, :ref:`you can " +"select which users can log into the POS <employee_login/use>` and :ref:`keep" +" track of the employees involved in each order <employee_login/analytics>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:9 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:15 msgid "" -"There are three ways to switch cashiers in Odoo: by *selecting the cashier*," -" by *entering a PIN code* or by *scanning a barcode*." +":ref:`Access the POS settings <configuration/settings>` and select your POS," +" or click the vertical ellipsis button (:guilabel:`⋮`) on a POS card and " +"click :guilabel:`Edit`. Then, enable :guilabel:`Multi Employees per " +"Session`, and add the allowed employees in the :guilabel:`Allowed Employees`" +" field." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:13 +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting to enable multiple cashiers in POS" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:26 +msgid "Practical application" +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:28 msgid "" -"To manage multiple cashiers, you need several employees (at least two)." +"Once the feature is activated, cashiers can log in :ref:`by scanning their " +"badge <employee_login/badge>` or selecting their name from the list of " +"allowed employees to :ref:`open the session <pos/session-start>`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:18 -msgid "Set up log in with employees" +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "window to open a session when the multiple cashiers feature is enabled" msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:20 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:35 msgid "" -"To enable the feature, go to your *PoS settings* and check log in with " -"employees on your *PoS form*. Then, add the employees that have access to " -"the cash register." +"To switch to another user :ref:`from an open session <pos/session-start>`, " +"click the employee name at the top-right of the screen and select the " +"employee to swap with from the list." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:27 -msgid "Now, you can switch cashier easily." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "button to switch from one cashier to another." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:30 -msgid "Switch without pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:32 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:41 msgid "" -"The easiest way to switch cashiers is without a code. To do so, click on the" -" cashier name in your PoS interface." +"You can also require your employees to enter a pin code every time they log " +"into a POS to prevent them from logging in as someone else. To define the " +"code, go to the **Employees** app, open the employee form, and click the " +":guilabel:`HR settings` tab. Then, enter a pin code of your choice in the " +":guilabel:`PIN Code` field of the :guilabel:`Attendance/Point of Sale` " +"category." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:38 -msgid "Now, you just have to click on your name." +#: ../../content/applications/sales/point_of_sale/employee_login.rst-1 +msgid "setting on the employee form to assign a badge ID and a PIN code." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:46 -msgid "Switch cashier with pin codes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:48 -msgid "" -"You can set a pin code on each cashier. To set up a pin code, go to the " -"employee form and add a security PIN, in the *HR settings tab*." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:52 +msgid "Log in using badges" msgstr "" #: ../../content/applications/sales/point_of_sale/employee_login.rst:54 -msgid "Now, when switching cashier, a PIN password will be asked." -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:62 -msgid "Switch cashier with barcodes" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:64 msgid "" -"You can ask your employees to log themselves with their badges. To do so, " -"set up a barcode at the same place you add the PIN code. Print the badge and" -" when they will scan it, the cashier will be switched to that employee." +"For your employees to be able to log in by scanning their badge, they must " +"have a badge ID assigned. To do so, go to the **Employees** app, open the " +"employee form, and click the :guilabel:`HR settings` tab. Then, enter the " +"badge ID of your choice in the :guilabel:`Badge ID` field of the " +":guilabel:`Attendance/Point of Sale` category or click :guilabel:`Generate`." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:73 -msgid "Find who was the cashier" -msgstr "" - -#: ../../content/applications/sales/point_of_sale/employee_login.rst:75 +#: ../../content/applications/sales/point_of_sale/employee_login.rst:59 msgid "" -"Once you have closed your *PoS session*, you can have an overview of the " -"amount each cashier sold for. To do so, go to the orders menu." +"To switch to another user, lock the session by clicking the lock-shaped icon" +" (:guilabel:`🔓`) at the top-right of the screen and scan your badge." msgstr "" -#: ../../content/applications/sales/point_of_sale/employee_login.rst:81 -msgid "Now, you can open the order and have a summary of the sold products." +#: ../../content/applications/sales/point_of_sale/employee_login.rst:65 +msgid "Analytics" +msgstr "統計分析" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:67 +msgid "" +"Once you close and post the POS session, access the comprehensive report to " +"review all session activities, including who initiated the session and who " +"handled specific orders. To access the session's report, click the vertical " +"ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Sessions` from the :guilabel:`View` section. Then, select a " +"specific session for more detailed information, and click the " +":guilabel:`Orders` button to view a list of all orders placed during that " +"session." +msgstr "" + +#: ../../content/applications/sales/point_of_sale/employee_login.rst:74 +msgid "" +"To get an overview of all orders, regardless of the session, click the " +"vertical ellipsis button (:guilabel:`⋮`) on the POS card and select " +":guilabel:`Orders` from the :guilabel:`View` section." msgstr "" #: ../../content/applications/sales/point_of_sale/payment_methods.rst:5 @@ -3851,21 +3860,21 @@ msgid "" ":guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:39 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:40 msgid "Invoices" msgstr "應收憑單" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:41 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:42 msgid "" "In Point of Sale, you can issue and print invoices upon payment at the cash " "register or retrieve all the past invoiced orders." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:45 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:46 msgid "Set a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:47 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:48 msgid "" "First, you need to open a session and set your customer. Open the **POS " "interface** by going to :menuselection:`Point of Sale --> New session --> " @@ -3877,7 +3886,7 @@ msgstr "" msgid "customer selection and creation button" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:54 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:55 msgid "" "From there, you can either set an existing customer by clicking their name " "or create a new one by clicking :guilabel:`Create`. Doing so opens a " @@ -3885,23 +3894,23 @@ msgid "" ":guilabel:`Save` to validate and set this new customer." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:59 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 msgid "" "You can also **edit** a customer's information by clicking " ":guilabel:`Details`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:60 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:61 msgid "" "If you did not set your customer during the order, you can do so at the " "payment screen by clicking :guilabel:`Customer`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:64 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:65 msgid "Invoice a customer" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:66 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:67 msgid "" "Once an order is done, click :guilabel:`Payment` to move to the **payment " "screen**. Click :guilabel:`Invoice` underneath the customer's name to enable" @@ -3912,27 +3921,27 @@ msgstr "" msgid "button to generate an invoice in POS" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:73 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:74 msgid "" "Select the payment method and click :guilabel:`Validate`. The **invoice** is" " automatically issued and ready to be downloaded and/or printed." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:77 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:78 msgid "Retrieve invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:79 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:80 msgid "To retrieve invoices from the **POS dashboard**," msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:81 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:82 msgid "" "access all orders made through your POS by going to :menuselection:`Point of" " Sale --> Orders --> Orders`;" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:83 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:84 msgid "" "to access an order's invoice, open the **order form** by selecting the " "order, then click :guilabel:`Invoice`." @@ -3942,23 +3951,23 @@ msgstr "" msgid "invoice smart button from an order form" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:90 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:91 msgid "" "**Invoiced orders** can be identified by the :guilabel:`Invoiced` status in " "the :guilabel:`Status` column." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:92 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:93 msgid "" "You can filter the list of orders to invoiced orders by clicking " ":guilabel:`Filters` and :guilabel:`Invoiced`." msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:96 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:97 msgid "QR codes to generate invoices" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:98 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:99 msgid "" "Customers can also request an invoice by scanning the **QR code** printed on" " their receipt. Upon scanning, they must fill in a form with their billing " @@ -3972,7 +3981,7 @@ msgstr "" msgid "order status change" msgstr "" -#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:107 +#: ../../content/applications/sales/point_of_sale/receipts_invoices.rst:108 msgid "" "To use this feature, you have to enable QR codes on receipts by going to " ":menuselection:`Point of Sale --> Configuration --> Settings`. Then, select " @@ -4606,8 +4615,9 @@ msgstr "" #: ../../content/applications/sales/point_of_sale/shop/barcode.rst:60 msgid "" "You can also use a barcode scanner to log your employees. To do so, " -":ref:`restrict access <restrict-employee-pos>` to the POS and :ref:`use " -"barcodes to log your employees in <employee-barcode>` your POS." +":ref:`restrict access <employee_login/configuration>` to the POS and " +":ref:`use barcodes to log your employees in <employee_login/badge>` your " +"POS." msgstr "" #: ../../content/applications/sales/point_of_sale/shop/sales_order.rst:3 diff --git a/locale/zh_TW/LC_MESSAGES/websites.po b/locale/zh_TW/LC_MESSAGES/websites.po index 2bbf8852d..9ef19e16b 100644 --- a/locale/zh_TW/LC_MESSAGES/websites.po +++ b/locale/zh_TW/LC_MESSAGES/websites.po @@ -4,18 +4,18 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# 敬雲 林 <chingyun@yuanchih-consult.com>, 2023 # Martin Trigaux, 2023 +# Tony Ng, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-23 09:13+0000\n" +"POT-Creation-Date: 2023-06-15 11:45+0000\n" "PO-Revision-Date: 2022-10-04 12:54+0000\n" -"Last-Translator: Martin Trigaux, 2023\n" -"Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/zh_TW/)\n" +"Last-Translator: Tony Ng, 2023\n" +"Language-Team: Chinese (Taiwan) (https://app.transifex.com/odoo/teams/41243/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -60,851 +60,2467 @@ msgid "" "`Odoo Tutorials: eCommerce <https://www.odoo.com/slides/ecommerce-26>`_" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started.rst:5 -msgid "Get started" -msgstr "開始" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:3 -msgid "How to customize my catalog page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping.rst:5 +msgid "Checkout, payment, and shipping" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:6 -msgid "Product Catalog" -msgstr "產品目錄" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:3 +msgid "Add to cart" +msgstr "加入購物車" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:8 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:5 msgid "" -"All your published items show up in your catalog page (or *Shop* page)." +"The :guilabel:`Add to Cart` button can be customized in multiple ways. You " +"can:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:13 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:7 msgid "" -"Most options are available in the *Customize* menu: display attributes, " -"website categories, etc." +"Choose on which page customers go after clicking the 'Add to Cart' button;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:20 -msgid "Highlight a product" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:8 +msgid "Hide the 'Add to Cart' button to prevent sales;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:22 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:9 msgid "" -"Boost the visibility of your star/promoted products: push them to top, make " -"them bigger, add a ribbon that you can edit (Sale, New, etc.). Open the Shop" -" page, switch to Edit mode and click any item to start customizing the grid." +"Add a 'Buy Now' button to skip the cart step and lead customers straight to " +"checkout;" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:26 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:10 +msgid "Create additional 'Add to Cart / Buy Now' buttons;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:11 +msgid "Add an 'Order Again' button to the customer portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:14 +msgid ":doc:`checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:17 +msgid "'Add to Cart' action customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:19 msgid "" -"See how to do it: " -"https://www.odoo.com/openerp_website/static/src/video/e-commerce/editing.mp4" +"When customers click on the :guilabel:`Add to Cart` button, the product is " +"added to their cart, and customers remain **by default** on the product's " +"page. However, customers can either immediately be **redirected** to their " +"cart, or given the choice on what to do through a **dialog box**." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:29 -msgid "Quick add to cart" -msgstr "" - -#: ../../content/applications/websites/ecommerce/getting_started/catalog.rst:31 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:23 msgid "" -"If your customers buy a lot of items at once, make their process shorter by " -"enabling purchases from the catalog page. To do so, add product description " -"and add to cart button. Turn on the following options in *Customize* menu: " -"Product Description, Add to Cart, List View (to display product description " -"better)." +"To change the default behavior, go to :menuselection:`Website --> " +"Configuration --> Settings`. Under the :guilabel:`Shop - Checkout Process` " +"section, look for :guilabel:`Add to Cart` and select one of the options." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:3 -msgid "How to build a product page" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:28 +msgid "" +"If a product has :doc:`optional products " +"<../managing_products/cross_upselling>`, the **dialog box** will always " +"appear." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:5 -msgid "On the website click *New Page* in the top-right corner." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:32 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:20 +msgid ":doc:`../managing_products/catalog`" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:7 -msgid "Then click *New Product* and follow the blinking tips." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:37 +msgid "Replace 'Add to Cart' button by 'Contact Us' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:12 -msgid "Here are the main elements of the Product page:" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:39 +msgid "" +"You can replace the 'Add to Cart' button with a 'Contact Us' button which " +"redirects users to the URL of your choice." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:17 -msgid "Many elements can be made visible from the *Customize* menu." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:43 +msgid "" +"Hiding the :guilabel:`Add to Cart` button is often used by B2B eCommerces " +"that need to restrict purchases only to :ref:`customers with an account " +"<checkout-sign>`, but still want to display an online product catalog for " +"those without." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:22 -msgid "See how to configure your products from links here below." +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:47 +msgid "" +"To do so, go to :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products` and tick :guilabel:`Prevent Sale of Zero Priced Product`. " +"This creates a new :guilabel:`Button url` field where you can enter the " +"**redirect URL** to be used. Then, set the price of the product to `0.00` " +"either from the **product's template**, or from a :doc:`pricelist " +"<../../../sales/sales/products_prices/prices/pricing>`." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:26 -msgid ":doc:`../managing_products/variants`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Contact us button on product page" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 -msgid ":doc:`/applications/sales/sales/products_prices/taxes`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:58 +msgid "" +"The 'Contact Us' button and '*Not Available For Sale*' text can both be " +"modified using the **website builder** on the product's page " +"(:menuselection:`Edit --> Customize`) by clicking on them." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 -msgid ":doc:`../maximizing_revenue/cross_selling`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:63 +msgid "Customizable 'Add to Cart' button" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:29 -msgid ":doc:`../maximizing_revenue/reviews`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:65 +msgid "" +"You can also create a customizable 'Add to Cart' button and link it to a " +"specific product. The **customized button** can be added on any page of the " +"website as an **inner content** building block, and is an *additional* " +"button to the regular :guilabel:`Add to Cart` button." msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:30 -msgid ":doc:`../maximizing_revenue/pricing`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:69 +msgid "" +"To add it, go on the :guilabel:`Shop` page of your choice, click " +":menuselection:`Edit --> Blocks` and place the building block. Once placed, " +"you have the following options:" msgstr "" -#: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:31 -msgid ":doc:`../../website/optimize/seo`" +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:72 +msgid "" +":guilabel:`Product`: select the product to link the button with. Selecting a" +" product renders the :guilabel:`Action` field available;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:74 +msgid "" +":guilabel:`Action`: choose if the button should :guilabel:`Add to Cart` or " +":guilabel:`Buy Now` (instant checkout)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:84 +msgid "'Buy Now' button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:86 +msgid "" +"You can enable the 'Buy Now' button to instantly take the customer to " +"**checkout** instead of adding the product to the cart. The :guilabel:`Buy " +"Now` button is an *additional* button and does not replace the " +":guilabel:`Add to Cart` button. To enable it, go to :menuselection:`Website " +"--> Configuration --> Settings --> Shop - Checkout Process` and tick " +":guilabel:`Buy Now`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Buy Now button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:97 +msgid "Re-order from portal" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst:99 +msgid "" +"Customers have the possibility to **re-order** items from **previous sales " +"orders** on the customer portal. To do so, go to :menuselection:`Website -->" +" Configuration --> Settings --> Shop - Checkout Process` and enable " +":guilabel:`Re-order From Portal`. Customers can find the :guilabel:`Order " +"Again` button on their **sales order** from the **customer portal**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/cart.rst-1 +msgid "Re-order button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:3 +msgid "Checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:5 +msgid "" +"You can customize the **checkout steps**, add more content using the " +"**website builder**, and enable additional features such as **express " +"checkout** and **sign in/up at checkout**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:8 +msgid "" +"You can use **building blocks** to add content at any step of the checkout " +"process. To do so, from any **checkout page**, go to :menuselection:`Edit " +"--> Blocks`, and drag and drop **building blocks** to the page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:13 +msgid "" +"Note that content added through building blocks is **specific** to each " +"step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:16 +msgid "Checkout steps" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:19 +msgid "Review order: promo code (and subtotal)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:21 +msgid "" +"If you have enabled :guilabel:`Discounts, Loyalty, & Gift Card` in the " +"settings (:menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`), you can enable the :guilabel:`Promo Code` field " +"(:menuselection:`Edit --> Customize`) from any checkout page. Customers can " +"then redeem gift cards and promotional codes at the :guilabel:`Review Order`" +" step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:26 +msgid "" +"Furthermore, you can display the subtotal with discounts applied by enabling" +" :guilabel:`Show Discount in Subtotal`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Subtotal discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:34 +msgid "Address: B2B fields" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:36 +msgid "" +"Optional :guilabel:`TIN/VAT` and :guilabel:`Company Name` fields can be " +"added to the :guilabel:`Billing Address` form for B2B customers, at the " +":guilabel:`Address` step. To add the fields, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Show B2B fields`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:42 +msgid "Request extra info (additional step)" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:44 +msgid "" +"You can request :guilabel:`Extra Info` from the customer by adding an " +":guilabel:`Extra Info` step between the :guilabel:`Address` and " +":guilabel:`Confirm Order` steps. To do so, go to :menuselection:`Edit --> " +"Customize` from any checkout page, and enable :guilabel:`Extra Step Option`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:53 +msgid "" +"The :guilabel:`Extra Info` step is an online form linked to the quotation or" +" sales order of the customer. The information added during that step can be " +"found on the quotation or sales order of the customer from the back end, in " +"the **Sales** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:57 +msgid "" +"When enabled, you can remove, add, and modify fields of the form by clicking" +" on :guilabel:`Edit` in the top-right corner, and then clicking on any of " +"the form's fields. All customization options, as well as the :guilabel:`+ " +"Field` button to add new fields, are available at the bottom of the " +":guilabel:`Customize` menu under the :guilabel:`Field` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Online form customization" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:67 +msgid "Confirm order: terms and conditions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:69 +msgid "" +"You can ask customers to agree to the :guilabel:`Terms & Conditions` in " +"order to confirm their order by enabling :guilabel:`Accept Terms & " +"Conditions` under :menuselection:`Edit --> Customize` on any checkout page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Terms and conditions" +msgstr "條款和條件" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:78 +msgid "Express checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:80 +msgid "" +"You can enable a :guilabel:`Buy Now` button on products' pages which " +"instantly takes the customer to the :guilabel:`Confirm Order` checkout page," +" instead of adding the product to the cart. To do so, go to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Checkout " +"Process section` and tick :guilabel:`Buy Now`. Alternatively, the " +":guilabel:`Buy Now` button can also be enabled from any product's page by " +"going :menuselection:`Edit --> Customize`, in the :guilabel:`Cart` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:86 +msgid "" +"The button can be found next to the :guilabel:`Add to Cart` button on the " +"product's page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst-1 +msgid "Buy now (express checkout) button" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:93 +msgid ":ref:`Product page design: additional functions <ecommerce-functions>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:98 +msgid "Guest and signed-in checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:100 +msgid "" +"It is possible to introduce a **checkout policy** under which customers can " +"either checkout as **guests** or **signed-in users only**. Customers can " +"also checkout as guest, and **optionally sign up later** in order to track " +"their order, if enabled." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:104 +msgid "" +"To select a policy, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shop - Checkout Process`. You can choose between:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:107 +msgid "" +":guilabel:`Optional`: allows guests to checkout and later register from the " +"**order confirmation** email to track their order;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:109 +msgid "" +":guilabel:`Disabled (buy as guest)`: customers can only checkout as guests;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:110 +msgid "" +":guilabel:`Mandatory (no guest checkout)`: customers can only checkout if " +"they have signed-in." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:113 +msgid ":doc:`../ecommerce_management/customer_accounts`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:114 +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:24 +msgid ":doc:`/applications/general/users/portal`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:117 +msgid "B2B access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:119 +msgid "" +"If you wish to restrict checkout only to **selected B2B customers**, enable " +":guilabel:`Mandatory (no guest checkout)` and go to :menuselection:`Website " +"--> eCommerce --> Customers`. Select the customer you wish to **grant access" +" to**, click :menuselection:`Action --> Grant portal access`, and click " +":guilabel:`Grant Access`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:125 +msgid "" +"Settings are **website-specific**, which means you can set up a B2C website " +"allowing **guest** checkout, and another for B2B customers with **mandatory " +"sign-in**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:129 +msgid "" +"Users can only have one portal access per **email**. They *cannot* be " +"granted access to two different portals with the same **email address**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:133 +msgid "Shared customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/checkout.rst:135 +msgid "" +"If you enable :guilabel:`Shared Customer Accounts` under " +":menuselection:`Website --> Configuration --> Settings --> Privacy section`," +" you can allow or disallow access to *all* websites for one same account." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:3 +msgid "Payment providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:5 +msgid "" +"Odoo supports a multitude of online :doc:`payment providers " +"</applications/finance/payment_providers>` for your website, allowing your " +"customers to pay with their preferred payment methods." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:10 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:55 +msgid ":doc:`/applications/sales/sales/products_prices/ewallets_giftcards`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:11 +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:12 +msgid ":doc:`../checkout_payment_shipping/checkout`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:14 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:95 +#: ../../content/applications/websites/website/configuration.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:24 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:10 +msgid "Configuration" +msgstr "配置" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:16 +msgid "" +"To set up payment providers on the eCommerce app, go to " +":menuselection:`Website --> Configuration --> Payment Providers`. From here," +" :guilabel:`Activate` the payment providers you wish to have available on " +"your shop, and configure them according to your needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:20 +msgid "" +"Alternatively, you can access **payment providers** via " +":menuselection:`Website --> Configuration --> Settings`. In the " +":guilabel:`Shop - Payment` section, you can :guilabel:`Configure SEPA Direct" +" Debit` if you wish to use it, as well as :guilabel:`View other providers`. " +"If you use the :guilabel:`Authorize.net` payment provider, the :ref:`Payment" +" Capture Method <payment_providers/features/manual_capture>` can be " +"configured in that same menu." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:27 +msgid "" +"If you are using :doc:`/applications/finance/payment_providers/paypal`, you " +"can also enable and configure it here." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:31 +msgid "Checkout payment options" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:33 +msgid "" +"Once activated, customers can choose the payment provider of their choice " +"during the **checkout process**, at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Payment provider selection at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:41 +msgid "eWallets and gift cards" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:43 +msgid "" +"When checking out, customers can pay with an eWallet or gift cards. To " +"enable these, go to :menuselection:`Website --> Configuration --> Settings`," +" and in the :guilabel:`Shop-Products` section, enable " +":menuselection:`Discounts, Loyalty & Gift Card`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst:47 +msgid "" +"Once enabled, customers can enter their gift card **code** or pay with their" +" eWallet at the checkout step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/payments.rst-1 +msgid "Enter gift card code to process checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:3 +msgid "Shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:5 +msgid "" +"Depending on your shipping strategy, you have the choice to either use your " +":ref:`own shipping methods <ecommerce-own-shipping>`, or use an integration " +"with an :ref:`existing shipping provider <ecommerce-shipping-providers>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:15 +msgid "Own shipping methods" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:17 +msgid "" +"You can create your own custom shipping methods and define rules to compute " +"shipping costs. To do so, go to :menuselection:`Website --> Configuration " +"--> Shipping Methods`, and either select an **existing** shipping method, or" +" :guilabel:`Create` one. When creating a shipping method, you can choose " +"between :doc:`Fixed Price " +"</applications/inventory_and_mrp/inventory/shipping/setup/delivery_method>`," +" :doc:`Based on Rules " +"</applications/inventory_and_mrp/inventory/shipping/setup/delivery_method>`," +" and :guilabel:`Pickup in store`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:26 +msgid "Pickup in store" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:28 +msgid "" +":guilabel:`Pickup in store` must first be **enabled** in the settings " +"(:menuselection:`Website --> Configuration --> Settings --> Shipping " +"section)` by checking :guilabel:`On Site Payments & Picking`. Once enabled, " +"you can select and :guilabel:`Customize Pickup Sites`. :guilabel:`Picking " +"sites` can be made **website-specific**, but are by default available for " +"*all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:34 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/delivery_method`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:35 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:83 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/invoicing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:36 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:85 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/multipack`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:37 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/cancel`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:42 +msgid "Shipping providers" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:44 +msgid "" +"Another solution is to use one of the integrations with an existing shipping" +" provider. The advantage of using an integration is that delivery costs are " +"automatically computed based on each order as well as generating shipping " +"labels." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:49 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/third_party_shipper`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:50 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:51 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/setup/dhl_credentials`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:52 +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:84 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/shipping/operation/labels`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:55 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:204 +msgid "Website availability" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:57 +msgid "" +"Shipping methods can be made available on **specific** websites *only*, if " +"desired. To do so, go to :menuselection:`Website --> Configuration --> " +"Settings --> Shipping Methods`, and select the desired **shipping method**. " +"In the :guilabel:`Website` field, set the website you want the shipping " +"method to be restrained to. Leave the field **empty** for the method to be " +"available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:63 +msgid "Delivery method at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst:65 +msgid "" +"Customers can choose the shipping method at the end of the checkout process," +" at the :guilabel:`Confirm Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst-1 +msgid "Delivery method choice at checkout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management.rst:5 +msgid "eCommerce management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:3 +#: ../../content/applications/websites/website/configuration/multi_website.rst:130 +msgid "Customer accounts" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:5 +msgid "" +"Having customer accounts on an eCommerce allows customers to access all " +"their documents from a single place. To access their account, customers must" +" be **logged-in** on the eCommerce website, click on their **username** in " +"the top-right corner of the screen, and click :guilabel:`My Account`. From " +"there, customers can access their :guilabel:`quotations`, " +":guilabel:`orders`, :guilabel:`invoices`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Customer account log-in" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:16 +msgid "" +"Customers can only have an account if the :ref:`sign in/up at checkout " +"<checkout-sign>` option allows for accounts creation." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:20 +msgid "" +"Similarly to the rest of the website, the customer account page can be " +"customized with **content blocks** and other features through the **website " +"builder**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:27 +msgid "Access restriction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:29 +msgid "" +"It is possible to allow or restrict the documents to which customers have " +"access through the website builder. Log in your **own** account with your " +"Odoo database credentials, and go to :menuselection:`Edit --> Customize`. " +"From the website builder menu, enable or disable the documents customers can" +" have access to." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst-1 +msgid "Documents to which customers have access to from their account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:39 +msgid "Multi-website account" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_accounts.rst:41 +msgid "" +"If you own multiple websites, you can make customer accounts available " +"across **all** websites. Then, the customer only needs one account. To do " +"so, go to :menuselection:`Website --> Configuration --> Settings --> Privacy" +" section`, and enable :guilabel:`Shared Customer Accounts`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:3 +msgid "Customer interaction" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:5 +msgid "" +"Odoo offers many ways to interact with customers and for customers to " +"interact with your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:10 +msgid "Product reviews" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:12 +msgid "" +"Customers can give a rating to your products. This is a great way to promote" +" your products or services since reviews can influence purchase processes. " +"To activate the **rating** feature, from your **shop page**, select a " +"product, go to :menuselection:`Edit --> Customize` and enable " +":guilabel:`Rating`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Rating of a product on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:22 +msgid "" +"Only portal users which purchased the product or service can leave ratings." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:25 +msgid "" +"Customer reviews can be hidden by clicking the :guilabel:`Visible` button " +"next to a published review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:29 +msgid "Live chat" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:31 +msgid "" +"A chatbot is available and can simulate a human-like conversation with " +"website visitors via text messages in a chat box." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:35 +msgid ":doc:`../../livechat`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:36 +msgid ":doc:`../../livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:37 +msgid ":doc:`../../livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:42 +msgid "Contact forms" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:45 +msgid "Helpdesk" +msgstr "技術支援" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:47 +msgid "" +"Customers may need support after purchasing a product or subscribing to a " +"service. It is possible to create a **contact form**, which, when fulfilled," +" automatically creates a new ticket for your **support team**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Contact form to submit a ticket to the support team" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:55 +msgid "" +"To add a contact form, **create** a new page (:menuselection:`+ New --> " +"Page`) if necessary, and drag and drop a :guilabel:`Form` block from the " +":guilabel:`Dynamic Content` section onto the page. Once placed, click on the" +" form (while in :guilabel:`Edit` mode), and in the :guilabel:`Action` field," +" select :guilabel:`Create a Ticket`. You can then select to which " +":guilabel:`Helpdesk team` the ticket should be assigned." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Action field to create a task upon submitting a form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:66 +msgid "Contact us" +msgstr "聯絡我們" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:68 +msgid "" +"A 'Contact Us' page makes it easier for customers and prospects to contact " +"your company and get in touch." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:71 +msgid "" +"To have a 'Contact Us' page, create a new page (:menuselection:`+ New --> " +"Page`) if necessary, and click on :menuselection:`Edit --> Customize`. Then," +" drag and drop a :guilabel:`Form` block onto the page. Select the form and " +"define the action to be performed when submitted in the :guilabel:`Action` " +"field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:76 +msgid "" +"When clicking on a field, or when adding a new field (:guilabel:`+ Field`), " +"you can select its :guilabel:`Type`. This enables different options, such as" +" :guilabel:`Multiple Checkboxes`, which customers can use to indicate the " +"services they are interested in, for example." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Tags to be selected on the 'Contact Us' form" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "'Checkboxes' configuration settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:89 +msgid "Newsletter" +msgstr "電子報" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:91 +msgid "" +"Customers can get updates on your eCommerce activities by subscribing to a " +"newsletter. Visitors subscribing to the newsletter are automatically added " +"to the mailing list of the **Email Marketing** application. You can either " +"choose a newsletter **block**, a newsletter **popup**, or both." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:95 +msgid "" +"**Popup**: prompts up a newsletter box when visitors scroll down the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:96 +msgid "" +"**Block**: displays a field on the page where customers can sign up by " +"entering their email." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:98 +msgid "" +"The newsletter **block** can be configured according to different " +":guilabel:`Templates`. To do so, click the **block** while in " +":menuselection:`Edit --> Customize`, and select a :guilabel:`Template` in " +"the :guilabel:`Newsletter Block` section. There are **three** templates " +"available:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:102 +msgid "" +":guilabel:`Email Subscription`: visitors can sign up by email to the " +"newsletter, without any choice to the content. The content is defined in " +":menuselection:`Edit --> Customize` in the :guilabel:`Newsletter` field;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:105 +msgid "" +":guilabel:`SMS Subscription`: is the same as :guilabel:`Email Subscription`," +" but by SMS;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:106 +msgid "" +":guilabel:`Form Subscription`: allows adding several fields, as well as a " +"checkbox for the visitor to agree to the **GDPR policy** of your website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst-1 +msgid "Form subscription configuration and settings" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/customer_interaction.rst:114 +msgid "" +"Alternatively, you can select :guilabel:`Subscribe to Newsletter` as " +":guilabel:`Action` when creating a :ref:`contact form <contact-form>`, " +"allowing for the same level of customization. Make sure to add a checkbox " +"stating visitors agree to be added to the mailing list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:3 +msgid "Order handling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:5 +msgid "" +"When a customer orders on your eCommerce, there are **three** record types " +"required to be handle in Odoo:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:8 +msgid ":ref:`Sales orders <handling/sales>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:9 +msgid ":ref:`Delivery orders <handling/delivery>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:10 +msgid ":ref:`Invoices & legal requirements <handling/legal>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:15 +msgid "Sales orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:18 +msgid "Order and payment status" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:20 +msgid "" +"The first step when a customer adds a product to his cart is the creation of" +" a quotation. Orders can be managed either from the **Website** or " +":doc:`Sales </applications/sales/sales>` app. eCommerce orders can " +"automatically be assigned to a specific sales team by going to " +":menuselection:`Website --> Configuration --> Settings`. In the **Shop - " +"Checkout Process** section, select a :guilabel:`Sales Team` or " +":guilabel:`Salesperson` to handle eCommerce orders." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Assignment of online orders to a sales team or salesperson" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:30 +msgid "" +"Orders can be found under :menuselection:`Website --> eCommerce --> " +"Orders/Unpaid Orders`. Each order goes through a different status:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:33 +msgid "" +"**Quotation**: a new product is added to the cart, but the customer has " +"*not* gone through the checkout process yet;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:35 +msgid "" +"**Quotation sent**: the customer has gone through the checkout process and " +"confirmed the order, but the payment is not yet confirmed;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:37 +msgid "" +"**Order**: the customer has gone through the checkout process, confirmed the" +" order, and the payment is received." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst-1 +msgid "Statuses of eCommerce orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:45 +msgid "Abandoned cart" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:47 +msgid "" +"An **abandoned cart** represents an order for which the customer did **not " +"finish** the checkout confirmation process. For these orders, it is possible" +" to send an **email reminder** to the customer automatically. To enable that" +" feature, go to :menuselection:`Website --> Configuration --> Settings` and " +"in the :guilabel:`Email & Marketing` section, enable " +":guilabel:`Automatically send abandoned checkout emails`. Once enabled, you " +"can set the **time-lapse** after which the email is sent and customize the " +"**email template** used." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:55 +msgid "" +"For abandoned cart emails, the customer must either have entered their " +"contact details during the checkout process; or be logged-in when they added" +" the product to their cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:61 +msgid "Delivery orders" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:64 +msgid "Delivery flow" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:66 +msgid "" +"Once a quotation has been confirmed, a delivery order is automatically " +"created. The next step is to process this delivery." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:69 +msgid "" +"Packing eCommerce orders usually requires picking the product, preparing the" +" packaging, printing the shipping label(s) and shipping to the customer. " +"Depending on the number of orders, strategy, or resources, those steps can " +"be considered as one or multiple actions in Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:73 +msgid "" +"An automatic email can be sent to the customer when the transfer status in " +"Odoo is “done”. To do so, enable the feature in the settings of the " +":doc:`Inventory </applications/inventory_and_mrp/inventory>` app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:78 +msgid "" +"If customers are allowed to pay when picking up their order in stores or by " +"wire transfer, the quotation is **not** be confirmed and the stock is " +"**not** be reserved. Orders must be confirmed manually to reserve products " +"in stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:88 +msgid "Returns and refunds" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:90 +msgid "" +"Customers can only return an order through an online form. It may not be " +"possible to return products depending on the return strategy or type of " +"product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:93 +msgid "" +"Full refunds can be directly sent to customers from within the order " +"interface. A refund-compatible payment provider needs to be enabled first." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:97 +msgid ":doc:`/applications/sales/sales/products_prices/returns`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:98 +msgid ":doc:`/applications/services/helpdesk/advanced/after_sales`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:99 +msgid ":doc:`/applications/finance/payment_providers`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:104 +msgid "Invoice and legal requirements" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:106 +msgid "" +"The final step of an ecommerce order is to generate the invoice and send it " +"to the customer. Depending on the type of business (B2B or B2C), an invoice " +"can either be generated automatically (B2B) or on demand of the customer " +"(B2C). This process can be automated if (and when) the online payment is " +":ref:`confirmed <handling/sales>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/order_handling.rst:111 +msgid "" +"To automate invoicing, go to :menuselection:`Website --> Configuration --> " +"Settings` and in the :guilabel:`Invoicing` section, enable " +":guilabel:`Automatic Invoice`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:3 +msgid "Performance monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:5 +msgid "" +"Odoo integrates a variety of tools to analyze and improve the performance of" +" your eCommerce website." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:9 +msgid "Performance analysis tools" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:12 +msgid "Data monitoring" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:14 +msgid "" +"**Website** allows monitoring and analysis of the sales performance of your " +"eCommerce. To access the **reporting view**, go to :menuselection:`Website " +"--> Reporting`. This dashboard helps you monitor everything related to " +"sales, such as sales performance per product, category, day, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst-1 +msgid "Performance reporting of eCommerce" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:22 +msgid "" +"By clicking :guilabel:`Measures`, you can select the type of measurement " +"used, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:24 +msgid ":guilabel:`Margin`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:25 +msgid ":guilabel:`Qty Invoiced`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:26 +msgid ":guilabel:`Untaxed Total`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:27 +msgid ":guilabel:`Volume`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:28 +msgid "..." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:30 +msgid "" +"Other options include **multiple views (Pivot, etc.), comparison** by " +"periods or years, and directly :guilabel:`insert in spreadsheet`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:34 +#: ../../content/applications/websites/website/configuration/multi_website.rst:153 +msgid "Analytics" +msgstr "統計" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:36 +msgid "" +"It is possible to link your Odoo website with Google Analytics. To do so, go" +" to :menuselection:`Website --> Configuration --> Settings` and scroll to " +"the :guilabel:`SEO` section. Then, enter your **ID** in the " +":guilabel:`Measurement ID` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:40 +msgid "" +"If you are still using **Universal Analytics**, it can directly be added by " +"injecting the code in the HTML header and body using the website builder. " +"All metrics from Google Analytics and Universal Analytics can be seen " +"directly within Odoo." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:44 +msgid "" +"Alternatively, Odoo offers the possibility to use another service, " +"**Plausible.io**. Plausible.io is a simple and privacy-friendly alternative " +"to Google Analytics. Everything can be managed directly in Odoo, there is no" +" need to visit Plausible.io's website to access your metrics." +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:49 +msgid ":doc:`/applications/websites/website/reporting/google_analytics`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/ecommerce_management/performance.rst:50 +msgid ":doc:`/applications/websites/website/reporting/plausible`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products.rst:5 -msgid "Manage my products" +msgid "Products" +msgstr "產品" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:3 +msgid "Catalog" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:3 -msgid "How to display several images per product" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:5 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:5 msgid "" -"By default your product web page displays the main image of your product " -"only. If you like to show your products under several angles, you can turn " -"the image into a carrousel." +"The eCommerce catalog is the equivalent of your physical store shelves: it " +"allows customers to see what you have to offer. Clear categories, available " +"options, sorting, and navigation threads help you structure it efficiently." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:11 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:10 +msgid "Categorize the product catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:12 msgid "" -"Check *Several images per product* in :menuselection:`Website Admin --> " -"Configuration --> Settings`." +"In Odoo, there is a **specific category model** for your eCommerce. Using " +"eCommerce categories for your products allows you to add a navigation menu " +"on your eCommerce page. Visitors can then use it to view all products under " +"the category they select." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:13 +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:16 msgid "" -"Open a product detail form and upload images from *Images* tab. Hit *Create*" -" in Edit mode to get the upload wizard." +"To do so, go to :menuselection:`Website --> eCommerce --> Products`, select " +"the product you wish to modify, click on the :guilabel:`Sales` tab, and " +"select the :guilabel:`Categories` you want under :guilabel:`eCommerce Shop`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/multi_images.rst:19 -msgid "Such extra image are common to all the product variants (if any)." +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "eCommerce categories under the \"Sales\" tab" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:25 +msgid "A single product can appear under multiple eCommerce categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:27 +msgid "" +"When your product's categories are configured, go to your **main shop page**" +" and click on :menuselection:`Edit --> Customize tab`. In the " +":guilabel:`Categories` option, you can either enable a menu on the " +":guilabel:`Left`, on the :guilabel:`Top`, or both. If you select the " +":guilabel:`Left` category, the option :guilabel:`Collapsable Category " +"Recursive` appears and allows to render the :guilabel:`Left` category menu " +"collapsable." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Categories options for your eCommerce website" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:38 +msgid ":doc:`products`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:43 +msgid "Browsing" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:45 +msgid "" +"The eCommerce category is the first tool to organize and split your " +"products. However, if you need an extra level of categorization in your " +"catalog, you can activate various **filters** such as attributes or sort-by " +"search." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:50 +msgid "Attributes" +msgstr "屬性" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:52 +msgid "" +"Attributes refer to **characteristics** of a product, such as **color** or " +"**material**, whereas variants are the different combinations of attributes." +" :guilabel:`Attributes and Variants` can be found under " +":menuselection:`Website --> eCommerce --> Products`, select your product, " +"and :guilabel:`Attributes & Variants` tab." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:58 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:15 +msgid ":doc:`../../../sales/sales/products_prices/products/variants`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Attributes and variants of your product" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:64 +msgid "" +"To enable **attribute filtering**, go to your **main shop page**, click on " +":menuselection:`Edit --> Customize tab` and select either :guilabel:`Left`, " +":guilabel:`Top`, or both. Additionally, you can also enable :guilabel:`Price" +" Filtering` to enable price filters." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:69 +msgid "" +":guilabel:`Price Filter` works independently from **attributes** and, " +"therefore, can be enabled on its own if desired." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:73 +msgid "" +"You can use **attribute filters** even if you do not work with product " +"variants. When adding attributes to your products, make sure only to specify" +" *one* value per attribute. Odoo does not create variants if no combination " +"is possible." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:78 +msgid "Sort-by search" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:80 +msgid "" +"It is possible to allow the user to manually **sort the catalog** using the " +"search bar. From your **main shop page**, click on :menuselection:`Edit --> " +"Customize tab`; you can enable or disable the :guilabel:`Sort-By` option as " +"well as the :guilabel:`Layout` button. You can also select the " +":guilabel:`Default Sort` of the :guilabel:`Sort-By` button. The default sort" +" applies to *all* categories." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:86 +msgid "The **sorting** options are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:88 +msgid "Featured" +msgstr "精選" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:89 +msgid "Newest Arrivals" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:90 +msgid "Name (A-Z)" +msgstr "名稱 (A-Z)" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:91 +msgid "Price - Low to High" +msgstr "價格 - 從低到高" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:92 +msgid "Price - High to Low" +msgstr "價格 - 從高到低" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:94 +msgid "" +"In addition, you can **manually edit** the catalog's order of a product by " +"going to **the main shop page** and clicking on the product. Under the " +":guilabel:`Product` section of the :guilabel:`Customize` section, you can " +"rearrange the order by clicking on the arrows. `<<` `>>` move the product to" +" the **extreme** right or left, and `<` `>` move the product by **one** row " +"to the right or left. It is also possible to change the catalog's order of " +"products in :menuselection:`Website --> eCommerce --> Products` and drag-" +"and-dropping the products within the list." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Product rearrangement in the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:107 +msgid "Page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:110 +msgid "Category page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:112 +msgid "" +"You can customize the layout of the category page using the website builder." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:115 +msgid "" +"Editing the layout of the category page is global; editing one category " +"layout affects *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:118 +msgid "" +"To do so, go on to your :menuselection:`Category page --> Edit --> " +"Customize`. Here, you can choose the layout, the number of columns to " +"display the products, etc. The :guilabel:`Product Description` button makes " +"the product description visible from the category page, underneath the " +"product picture." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Layout options of the category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:127 +msgid "" +"You can choose the size of the grid, but be aware that displaying too many " +"products may affect performance and page loading speed." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:131 +msgid "Product highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:133 +msgid "" +"You can highlight products to make them more visible on the category or " +"product page. On the page of your choice, go to :menuselection:`Edit --> " +"Customize` and click on the product to highlight. In the :guilabel:`Product`" +" section, you can choose the size of the product image by clicking on the " +"grid, and you can also add a **ribbon** or :guilabel:`Badge`. This displays " +"a banner across the product's image, such as:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:139 +msgid "Sale;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:140 +msgid "Sold out;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:141 +msgid "Out of stock;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:142 +msgid "New." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:144 +msgid "" +"Alternatively, you can activate the :doc:`developer mode " +"<../../../general/developer_mode>` on the **product's template**, and under " +"the :guilabel:`Sales` tab, change or create the ribbon from the " +":guilabel:`Ribbon` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:149 +msgid "" +"The :doc:`developer mode <../../../general/developer_mode>` is only intended" +" for experienced users who wish to have access to advanced tools. Using the " +"**developer mode** is *not* recommended for regular users." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Ribbon highlight" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:158 +msgid "Additional features" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:160 +msgid "" +"You can access and enable additional feature buttons such as **add to " +"cart**, **comparison list**, or a **wishlist**. To do so, go to your **main " +"shop page**, and at the end of the :guilabel:`Products Page` category, click" +" on the feature buttons you wish to use. All three buttons appear when " +"hovering the mouse over a product's image." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:165 +msgid "" +":guilabel:`Add to Cart`: adds a button to :doc:`add the product to the cart " +"<../checkout_payment_shipping/cart>`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:167 +msgid "" +":guilabel:`Comparison List`: adds a button to **compare** products based on " +"their price, variant, etc.;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:169 +msgid "" +":guilabel:`Wishlist Button`: adds a button to **wishlist** the product." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Feature buttons for add to cart, comparison list, and wishlist" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Appearance of buttons when hoovering over the mouse" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:180 +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:112 +msgid "Add content" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:182 +msgid "" +"You can use **building blocks** to add content on the category page, with a " +"variety of blocks ranging from :guilabel:`Structure` to :guilabel:`Dynamic " +"Content`. Specific areas are defined to use blocks are defined and " +"highlighted on the page when **dragging-and-dropping** a block." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst-1 +msgid "Building blocks areas" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:190 +msgid "" +"If you drop a building block **on top** of the product list, it creates a " +"new category header specific to *that* category." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:192 +msgid "" +"If you drop a building **on the top** or **bottom** of the page, it becomes " +"visible on *all* category pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/catalog.rst:196 +msgid "" +"Adding content to an eCommerce category page is beneficial in terms of " +"**SEO** strategy. Using **keywords** linked to the products or the eCommerce" +" categories improves organic traffic. Additionally, each category has its " +"own specific URL that can be pointed to and is indexed by search engines." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:3 +msgid "Cross-selling and upselling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:5 +msgid "" +"Any sales process is an opportunity to maximize revenues. **Cross-selling " +"and upselling** are sales techniques consisting in selling customers " +"additional or more expensive products and services than what they were " +"originally shopping for. It is a great way to maximize the value of each one" +" of your customers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:10 +msgid "**Cross-selling** can be done via **two** features:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:12 +msgid "" +":ref:`Optional products <cross_upselling/optional>` upon **adding to cart**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:13 +msgid "" +":ref:`Accessory products <cross_upselling/accessory>` on the **checkout " +"page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:15 +msgid "" +"**Upselling** is only done via :ref:`alternative products " +"<cross_upselling/alternative>` on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:19 +msgid ":doc:`catalog`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:22 +msgid "Cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:27 +msgid "Optional products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:29 +msgid "" +"**Optional products** are suggested when customers click :guilabel:`Add to " +"cart`, either from the **product page** or **catalog page**. Upon clicking, " +"a pop-up window opens with the **optional products** displayed in the " +":guilabel:`Available Options` section." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Optional products cross-selling" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:37 +msgid "" +"To enable **optional products** go to :menuselection:`Website --> eCommerce " +"--> Products`, select a product, go to the :guilabel:`Sales` tab, and enter " +"the products you wish to feature in the :guilabel:`Optional Products` field." +" Optional products are **linked** to the product(s) they are set up with on " +"the **product template**. They only appear when that product is added to the" +" cart." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:43 +msgid "" +"You can also access the :guilabel:`Sales` tab of the **product template** by" +" selecting a product on your **main shop page** and clicking " +":guilabel:`Product` in the top-right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:49 +msgid "Accessory products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:51 +msgid "" +"**Accessory products** are displayed in the :guilabel:`Suggested " +"Accessories` section before processing to checkout at the :guilabel:`Review " +"Order` step." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Suggested accessories at checkout during cart review" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:58 +msgid "" +"To enable **accessory products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Accessory " +"Products` field. Suggested accessory products are **linked** to the " +"product(s) they are set up with on the **product template**. They only " +"appear when that product is at the checkout process review." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:65 +msgid "Upselling" +msgstr "超售" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:70 +msgid "Alternative products" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:72 +msgid "" +"**Alternative products** are suggested on the **product page** and usually " +"incentivize customers to buy a more expensive variant or product than the " +"one they were initially shopping for." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst-1 +msgid "Alternative products on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:79 +msgid "" +"To enable **alternative products**, go to :menuselection:`Website --> " +"eCommerce --> Products`, select a product, go to the :guilabel:`Sales` tab, " +"and enter the products you wish to feature in the :guilabel:`Alternative " +"Products` field. Then, go to the related **product page** by clicking " +":guilabel:`Go To Website`, and click :menuselection:`Edit`. Stay on the " +":guilabel:`Blocks` tab, and scroll down to the :guilabel:`Dynamic Content` " +"section. Then, drag and drop the :guilabel:`Products` building block " +"anywhere on the **product page**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/cross_upselling.rst:86 +msgid "" +"When placed, in :guilabel:`Edit` mode, click the **block** to access various" +" settings for that :guilabel:`Products` building block. In the " +":guilabel:`Filter` field, select :guilabel:`Alternative Products`. You can " +"configure several additional settings, such as how many elements are " +"displayed (:guilabel:`Fetched Elements`), the :guilabel:`Template` used, " +"etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:3 +msgid "Price management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:5 +msgid "" +"Odoo offers multiple options to select the price displayed on your website, " +"as well as condition-specific prices based on set criteria." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:9 +msgid "Taxes" +msgstr "稅金" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:12 +msgid "Tax configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:14 +msgid "" +"To add a tax on a product, you can either set a tax in the " +":guilabel:`Customer Taxes` field of the **product template** or use " +":doc:`fiscal positions " +"</applications/finance/accounting/taxes/fiscal_positions>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:19 +msgid ":doc:`/applications/finance/accounting/taxes`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:20 +msgid ":doc:`/applications/finance/accounting/taxes/avatax`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:21 +msgid ":doc:`/applications/finance/accounting/taxes/taxcloud`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:22 +msgid ":doc:`/applications/finance/accounting/taxes/fiscal_positions`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:25 +msgid "Tax display" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:27 +msgid "" +"Choosing the displayed price tax usually depends on a country's regulations " +"or the type of customers **(B2B vs. B2C)**. To select the type of price " +"displayed, go to :menuselection:`Website --> Configuration --> Settings`, " +"scroll down to the :guilabel:`Shop - Products` category, and select " +":guilabel:`Tax Excluded` or :guilabel:`Tax Included`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:32 +msgid "" +":guilabel:`Tax Excluded`: the price displayed on the website is **tax-" +"excluded**, and the tax is computed at the cart-review step;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:34 +msgid "" +":guilabel:`Tax Included`: the price displayed on the website is **tax-" +"included**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:37 +msgid "" +"This setting is **global**, and the tax-display type is the same for (all " +"of) your website(s). It is, therefore, not possible to select different tax " +"displays for different websites. This may be a significant point of " +"consideration when implementing a database with multiple ecommerce websites " +"aimed at varying customer types (i.e., B2B and B2C)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:42 +msgid "" +"You can choose to display the type of pricing next to the product price by " +"going to :menuselection:`Website --> Site --> Homepage --> Shop`, selecting " +"a product, and then :menuselection:`Edit --> Customize tab` and enabling " +":guilabel:`Tax Indication`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Tax type displayed on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:51 +msgid ":doc:`/applications/finance/accounting/taxes/B2B_B2C`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:54 +msgid "Price per unit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:56 +msgid "" +"It is possible to display a :doc:`price per unit " +"</applications/inventory_and_mrp/inventory/management/products/uom>` on the " +"product page. To do that, go to :menuselection:`Website --> Configuration " +"--> Settings` and enable :guilabel:`Product Reference Price` under the " +":guilabel:`Shop - Products` section. When enabled, ensure an amount is set " +"in the :guilabel:`Base Unit Count` field of the **product template**, and in" +" the :guilabel:`Sales Price`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product template" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:67 +msgid "" +"The price per unit of measure can be found above the :guilabel:`Add to Cart`" +" button on the product page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Cost per unit pricing on the product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:75 +msgid "" +"Pay attention that having the price per unit may be **mandatory** in some " +"countries." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:78 +msgid "" +":doc:`/applications/inventory_and_mrp/inventory/management/products/uom`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:83 +msgid "Price configuration: pricelists" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:85 +msgid "" +"Pricelists are the primary tool to manage prices on your eCommerce. They " +"allow you to define website-specific prices - different from the price on " +"the product template - based on the **country group**, **currency**, " +"**minimum quantity**, **period**, or **variant**. You can create as many " +"pricelists as needed, but it is mandatory to have at least one pricelist " +"configured per website. If no custom pricelists are added, Odoo defaults to " +"the **Public Pricelist** for all websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:92 +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:120 +msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:97 +msgid "" +"Pricelists can be found under :menuselection:`Website --> eCommerce --> " +"Pricelists`, but must first be activated. For that, head to " +":menuselection:`Website --> Configuration --> Settings` and scroll down to " +"the :guilabel:`Shop - Products` section. There, you can find two options:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:101 +msgid ":guilabel:`Multiple prices per product`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:102 +msgid ":guilabel:`Advanced price rules (discounts, formulas)`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:104 +msgid "" +"The **first** option allows you to set different prices per customer " +"*segment*, i.e., registered customers, gold customers, regular customers, " +"etc. The **second** option allows you to set *price change* rules such as " +"**discounts**, **margins**, **roundings**, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:109 +msgid "Foreign currency" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:111 +msgid "" +"If you are selling in **multiple currencies** and have pricelists in foreign" +" currencies, customers can select their corresponding pricelist anywhere on " +"the :guilabel:`Shop` page from the drop-down menu next to the **search " +"bar**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Pricelists selection" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:121 +msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:124 +msgid "Permanent discount" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:126 +msgid "" +"If you have permanently reduced the price of a product, a popular means to " +"attract customers is the **strikethrough** strategy. The strategy consists " +"in displaying the previous price crossed out and the **new discounted " +"price** next to it." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst-1 +msgid "Price strikethrough" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/price_management.rst:134 +msgid "" +"To display a 'striked' price, enable the :guilabel:`Comparison Price` option" +" under :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products category`. Then, head to the product's template " +"(:menuselection:`Website --> eCommerce --> Products`), and in the " +":guilabel:`Compare to Price` field, enter the **new** price." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:3 +msgid "Product management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:5 +msgid "" +"Odoo allows you to create, import, and manage your products' pages all " +"within the **Website** app." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:8 +msgid "Add products to the catalog" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:10 +msgid "To add a product to your catalog, you can either do it in:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:12 +msgid "" +"From anywhere on your website, click :menuselection:`+ New --> Product`. " +"Enter the name of your product, and :guilabel:`Save`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:14 +msgid ":menuselection:`Website --> eCommerce --> Products --> Create`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:15 +msgid "" +"or by :ref:`importing data <import-data>` using XLSX or CSV files. To do so," +" go to :menuselection:`Website --> eCommerce --> Products`. Click on " +":guilabel:`Favorites` and :ref:`Import records <import-data>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:21 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 +msgid ":doc:`../../../sales/sales/products_prices/products/import`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:22 +msgid ":doc:`Product-related documentation <../../../sales/sales>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:25 +msgid "Publish" +msgstr "公開" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:27 +msgid "" +"Upon creation, products are defaulted as :guilabel:`Unpublished` in your " +"eCommerce catalog. To make a product visible to visitors, go to " +":menuselection:`Website --> Site --> Homepage`, click on your **main shop** " +"page, select the product, and enable it as :guilabel:`Published` in the top-" +"right corner." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:33 +msgid "" +"To publish **large batches** of products, the most convenient fashion is to " +"go to :menuselection:`Website --> eCommerce --> Products`. Here, remove the " +":guilabel:`Published` filter by clicking on the :guilabel:`x` right to it, " +"and then select the :guilabel:`List` view. Next, click the " +":guilabel:`dropdown toggle` button (located right below the :guilabel:`List`" +" button) and enable :guilabel:`Is published`. Click the :guilabel:`Is " +"Published` column to re-order it either by **published** or **unpublished** " +"products. Finally, select the products to publish by ticking their box on " +"the extreme-right, and tick any box of the selected products in the " +":guilabel:`Is Published` column to publish them all." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "List and dropdown toggle buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:47 +msgid "Product page design" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:49 +msgid "" +"Once a product is created, you can access its **product page** through the " +":guilabel:`Shop` page by clicking on the product, and then clicking " +":guilabel:`Edit`. Here, you can change the page's **additional functions**, " +"**layout**, **add content**, etc. Note that **enabled functions** apply to " +"*all* product pages." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:57 +msgid "Additional functions" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:59 +msgid "" +"In the **website builder** window, click :guilabel:`Customize` to enable " +"additional functions:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:61 +msgid "" +":guilabel:`Customers: Rating` allows customers to submit :ref:`product " +"reviews <product-reviews>`; :guilabel:`Share` adds social media and email " +"icon buttons to share the product via those channels;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:64 +msgid "" +":guilabel:`Select Quantity`: if enabled, allows to choose the quantity added" +" to cart;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:65 +msgid "" +":guilabel:`Tax Indication`: notifies if the price is **VAT included** or " +"**excluded**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:66 +msgid "" +":guilabel:`Variants`: shows all possible :doc:`variants " +"</applications/sales/sales/products_prices/products/variants>` of the " +"product as a :guilabel:`Products List`; :guilabel:`Options` as selectable " +"options to compose the variant yourself;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:70 +msgid "" +":guilabel:`Cart`: :guilabel:`Buy Now` adds a :ref:`checkout button " +"<cart/buy-now>` taking the customer directly to the checkout page; " +":guilabel:`Wishlist` allows to add the product to a wishlist;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:73 +msgid "" +":guilabel:`Specification`: allows you to select where the " +":guilabel:`Specifications` section is displayed. This option displays a list" +" of all variant attributes and values of a product, but only works for " +"products *with* variants." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:78 +msgid "" +"To allow **wishlists**, the option must be enabled in " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:80 +msgid "" +"To access the :guilabel:`Variants` options, the :doc:`Product Variants " +"<../../../sales/sales/products_prices/products/variants>` option must first " +"be enabled under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Products`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:85 +msgid "Layout" +msgstr "格式" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:87 +msgid "" +"Within the same :guilabel:`Customize` tab as the :ref:`functions <ecommerce-" +"functions>`, the layout configuration can be changed according to your " +"needs." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:90 +msgid "" +":guilabel:`Images Width`: changes the width of the product images displayed " +"on the page;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:91 +msgid "" +":guilabel:`Layout`: the :guilabel:`Carousel` layout displays a large, main " +"image with smaller ones underneath; whereas the :guilabel:`Grid` displays " +"four images in a square layout (see pictures below);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:94 +msgid "" +":guilabel:`Image Zoom`: choose which image zooms are available, either " +":guilabel:`Pop-up on Click`, when hovering over the image " +"(:guilabel:`Magnifier on hover`), on :guilabel:`Both`, or :guilabel:`None`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:97 +msgid "" +":guilabel:`Thumbnails`: decide how the thumbnails should be aligned, either " +"**vertically** (:guilabel:`Left`), or **horizontally** (:guilabel:`Right`);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:99 +msgid "" +":guilabel:`Main Image`: click :guilabel:`Replace` to change the product's " +"main image;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:100 +msgid "" +":guilabel:`Extra Images`: click :guilabel:`Add` or :guilabel:`Remove all` to" +" add or remove extra product images. You can also add images and videos via " +"**URL**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:104 +msgid "" +"Images must either be in PNG or JPG format. To trigger the zoom, the image " +"has to be bigger than 1024x1024." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product images layout" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:114 +msgid "" +"You can use **building blocks** (:menuselection:`Edit --> Blocks`) to add " +"content to your product page. These blocks can be used to add extra text and" +" picture galleries, features such as :guilabel:`Call to Actions`, " +":guilabel:`Comparisons`, etc." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:118 +msgid "" +"Depending on *where* you drop the **building block**, it may be available " +"either on the product page *only*, or on the *whole* website. **Building " +"blocks** dropped at the very top or very bottom of the page are available on" +" the *whole* website, where **building blocks** put underneath the product " +"description are only displayed on the *product* page *(see image below)*." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Building blocks on product page" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:128 +msgid "Download link" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:130 +msgid "" +"To add a downloadable file (ex.: user's manual, notice of use, etc.) on the " +"product page, drag and drop a :guilabel:`Text` block from " +":menuselection:`Edit --> Blocks` on the page. Once placed, click within the " +":guilabel:`Text` block, and under the :guilabel:`Inline Text` section, " +"select either :menuselection:`Insert Media --> Documents` or " +":guilabel:`Insert or edit link` and enter the URL in the :guilabel:`Your " +"URL` field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:137 +msgid "" +"The difference with :ref:`digital files <ecommerce-digital-file>` is that " +"digital files can only be downloaded *after* checkout." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Media and link buttons" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:147 +msgid "Digital files" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:149 +msgid "" +"Should your product be sold with a certificate, manual user, or any other " +"relevant document, it is possible to add a download link for customers at " +"the end of the checkout. To do that, first enable :guilabel:`Digital " +"Content` under :menuselection:`Website --> Configuration --> Settings --> " +"Shop - Checkout Process`. Then, on the **product's template**, click on " +":menuselection:`More --> Digital Files` and :guilabel:`Create` a new file." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Digital Files menu" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:159 +msgid "For the configuration:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:161 +msgid ":guilabel:`Name`: the name of your file;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:162 +msgid "" +":guilabel:`Type:` select if it is either a **file** or a **URL**. " +"Accordingly, you either have a :guilabel:`File Content (base64)` field to " +"upload your file, or a :guilabel:`URL` field to enter your URL." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:165 +msgid "" +":guilabel:`Website`: the website on which that file is *available*. If you " +"want it available for *all* websites, leave it empty." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:168 +msgid "" +"The file is then available after checkout in the **purchase order** section " +"found on the customer's portal." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:172 +msgid "Product configuration" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:175 +msgid "Multiple languages" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:177 +msgid "" +"If multiple languages are available on your website and you wish to have the" +" product's information translated, it is necessary to encode this translated" +" information in the **product's template**. Fields with multiple languages " +"available are identifiable by their abbreviation language (ex. :abbr:`EN " +"(English)`) next to their field." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Field translation" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:186 +msgid "The **eCommerce-related** fields to translate are:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:188 +msgid ":guilabel:`Product name`;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:189 +msgid ":guilabel:`Out-of-Stock Message` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:190 +msgid ":guilabel:`Sales Description` (under the :guilabel:`Sales` tab);" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:193 +msgid "" +"Having untranslated content on a web page may be detrimental to the user " +"experience and :doc:`SEO <../../../websites/website/pages/seo>`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:196 +msgid "" +"To check the language(s) of your website, go to :menuselection:`Website --> " +"Configuration --> Settings --> Website Info section`." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:200 +msgid ":doc:`../../../websites/website/pages/seo`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:201 +msgid ":ref:`Multi-language support <seo-multilanguage>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:206 +msgid "" +"A product can be set available on either *one* or *all* websites, but it is " +"not possible to select *some* websites and not others. To define a product's" +" availability, go to :menuselection:`Website --> eCommerce --> Products`, " +"select your product, and in the :guilabel:`Sales` tab, click the " +":guilabel:`Website` you wish the product to be available on. Leave the field" +" empty for the products to be available on *all* websites." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:213 +msgid "Stock management" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:215 +msgid "" +"Under the :menuselection:`Website --> Configuration --> Settings --> Shop - " +"Products`, you can enable and configure inventory management options." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:219 +msgid "" +"To display the stock level on the product page, the :guilabel:`Product Type`" +" on the **product's form** must be set to :guilabel:`Storable` (only " +"available when the **Inventory** app is installed)." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:224 +msgid "Inventory" +msgstr "庫存" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:226 +msgid "" +"In the :guilabel:`Inventory Defaults` sub-section, you can select the " +"eCommerce selling strategy of products:" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:229 +msgid "" +":guilabel:`Warehouse`: if you have multiple warehouses, you can define the " +"warehouse associated to your website. If you have multiple websites, you can" +" select a different one per website;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:231 +msgid "" +":guilabel:`Out-of-Stock (Continue Selling)`: enabling it allows customers to" +" continue placing orders even when the product is **out-of-stock**. Leave it" +" unchecked to **prevent orders**;" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:234 +msgid "" +":guilabel:`Show Available Qty`: enabling it displays the available quantity " +"left under a specified threshold on the product page. The available quantity" +" is calculated based on the 'On hand' quantity minus the quantity already " +"reserved for outgoing transfers." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:239 +msgid ":ref:`Allow only selected customers to buy <cart/prevent-sale>`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:242 +msgid "Selling as kit" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:244 +msgid "" +"If you are selling non-prepackaged kits (i.e., the kits are made of " +"individual products), we recommend you read the related documentation to " +"keep track of your stock." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:248 +msgid "" +":doc:`../../../inventory_and_mrp/manufacturing/management/kit_shipping`" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:251 +msgid "Product comparison" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:253 +msgid "" +"You can enable a **product comparison tool** for your eCommerce by going to " +":menuselection:`Website --> Configuration --> Settings --> Shop - Products`," +" and ticking :guilabel:`Product Comparison Tool`. This tool allows to save " +"products' **specifications** and compare them against each other on a single" +" page." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:258 +msgid "" +"On the product page, scroll down to the :guilabel:`Specifications` section " +"and click :guilabel:`Compare`. Repeat the same process for all products you " +"wish to compare. Then, click the :guilabel:`Compare` button of the pop-up " +"window at the bottom of the page to reach the comparison summary." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst:264 +msgid "" +"The :guilabel:`Product Comparison Tool` can only be used if :doc:`attributes" +" <variants>` are set on the **product's template**." +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/products.rst-1 +msgid "Product comparison window" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:3 -msgid "Manage product variants" +msgid "Product variants" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:5 msgid "" -"Product variants are used to offer variations of the same product to your " -"customers on the product's page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:8 -msgid "" -"Let's say one of your customers selects a T-shirt from your product catalog." +"Product variants are variations, such as different colors, materials, etc., " +"of the same product. These variations can differ in price and availability " +"from the product. Product variants can either be :doc:`created " +"<../../../sales/sales/products_prices/products/variants>` or :doc:`imported " +"<../../../sales/sales/products_prices/products/import>`." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:10 msgid "" -"Then, they choose the size and color they want. The various size and color " -"combinations are known as product variants." +"To use product variants, enable them under :menuselection:`Website --> " +"Configuration --> Settings`, in the :guilabel:`Shop - Products` section." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:14 -msgid "Create attributes & variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:16 -msgid "" -"In order to create various attributes and variants for your products, you " -"first need to turn on *Variants* in :menuselection:`Sales --> Configuration " -"--> Settings`." +msgid ":doc:`../managing_products/products`" msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:19 +msgid "Product configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:21 msgid "" -"Then, select a product from the Products list (:menuselection:`Sales / " -"Website --> Products --> Products`). When the product detail form opens, " -"click on *Edit*, and go to the *Variants* tab." +"Adding attributes and values to a product template allows the enabling of " +"the **product configurator** on the product page. Customers use it to " +"configure and select the product variant of their choice; or in the case of " +"multiple attributes, combine those to create a specific variant." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:22 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Variants configurator" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:29 msgid "" -"Here, you can add as many different attributes as you'd like by clicking on " -"*Add a line*." +"The **display type** of each attribute used in the product configurator can " +"be edited through the **website builder** by clicking :menuselection:`Edit " +"--> Customize` on the product page, and then clicking on one of the " +"attributes. You can then select between four options:" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:24 -msgid "These attributes appear as three different types:" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:33 +msgid ":guilabel:`Radio`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:26 -msgid "Radio buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:34 +msgid ":guilabel:`Pills`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:27 -msgid "Color buttons" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:35 +msgid ":guilabel:`Select`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:28 -msgid "Drop-down menu" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:36 +msgid ":guilabel:`Color`" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:30 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Display type options for attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:44 msgid "" -"Several variants appear as soon as there are two values for one attribute." +"Alternatively, the **display type** can be edited through " +":menuselection:`Website --> eCommerce --> Attributes`, selecting an " +"**attribute**, and then choosing a :guilabel:`Display Type`; or through the " +"**product template** by going to :menuselection:`eCommerce --> Products`, " +"selecting a product, and then clicking :guilabel:`Attributes and Variants`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:32 -msgid "Don't forget to hit *Save* once all variants have been entered." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants values" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:39 -msgid "Edit variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:41 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:50 msgid "" -"After you hit *Save*, you are able to see all the variants from the product " -"template detail form via the *Variants* smart button." +"Specific combinations of values can be excluded from the product " +"configurator. This way, customers are unable to select the excluded " +"combination of values. To do so, go to :menuselection:`Website --> eCommerce" +" --> Products`, select a product, and go to :guilabel:`Attributes and " +"Variants`. Then, click on an **attribute**, select a **value**, and in the " +":guilabel:`Exclude for` section, select a :guilabel:`Product Template` and " +"the :guilabel:`Attribute Values` to exclude." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants smart button" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:58 +msgid "Product specifications" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:48 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:60 msgid "" -"Clicking the *Variants* smart button takes you to the Product Variants page," -" where you can edit the following data for each specific variant:" +"Values used for each attribute are displayed as a **specification list** at " +"the bottom of the product page. To be visible, the **specification list** " +"must first be enabled on the product page by going to :menuselection:`Edit " +"--> Customize` and selecting a placement for the field " +":guilabel:`Specification`." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:51 -msgid "Picture(s)" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Specifications list on the product page" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:52 -msgid "Internal Reference (SKU #)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:53 -msgid "Barcode" -msgstr "條碼" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:54 -msgid "Volume" -msgstr "音量" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:55 -msgid "Weight" -msgstr "重量" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:56 -msgid "Cost" -msgstr "成本" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:59 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:70 msgid "" -"Both the Barcode and the Internal Reference are variant-specific. You need " -"to populate them once the variants are generated." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:63 -msgid "Set specific prices per variant" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:65 -msgid "" -"You can set a specific public price per variant by clicking on *Configure " -"Variants* in the product detail form (top-left corner). That takes you to " -"the *Product Variant Values* page for that product." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants configure variants" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:72 -msgid "" -"To set a specific public price for a particular variant, simply click on the" -" variant you want to modify, then click on *Edit*." +"The product **specification list** can also be used on products without " +"variants. For that, make sure to have no values combination. Products with " +"single values for their attributes do not generate variants." msgstr "" #: ../../content/applications/websites/ecommerce/managing_products/variants.rst:75 +msgid "Filter catalog by attributes" +msgstr "" + +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:77 msgid "" -"The *Value Price Extra* field represents the monetary value that is added to" -" the original product price whenever the corresponding attribute value is " -"selected." +"Customers **can** filter the **catalog** based on product attributes and " +"values, allowing them to :ref:`filter <ecommerce-browsing>` the catalog " +"based only on the attribute(s) of their choice." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:82 -msgid "This is how the *Value Price Extra* looks on your website:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce value price extra on the frontend" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:89 +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:80 msgid "" -"Pricelist formulas let you set advanced price computation methods for " -"product variants. See :doc:`../maximizing_revenue/pricing`." +"To enable **attributes filtering**, go to :menuselection:`Edit --> " +"Customize` from your **main shop page** and click on one of the " +":guilabel:`Categories` in the left column. Here, enable either " +":guilabel:`Left`, :guilabel:`Top`, or **both**, in the " +":guilabel:`Attributes` field." msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:93 -msgid "Disable/archive variants" +#: ../../content/applications/websites/ecommerce/managing_products/variants.rst-1 +msgid "Categories buttons" msgstr "" -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:95 -msgid "" -"You can disable/archive specific variants so they are no longer available in" -" quotes or on your website (not existing in your stock, deprecated, etc.). " -"Simply select *Archive* in their detail form. You can reactivate them the " -"same way." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:103 -msgid "" -"To retrieve such items, hit *Archived* in the *Filters* category while " -"searching the variants list." -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rstNone -msgid "ecommerce product variants archive search" -msgstr "" - -#: ../../content/applications/websites/ecommerce/managing_products/variants.rst:110 -msgid ":doc:`../../../sales/sales/products_prices/products/variants`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue.rst:5 -msgid "Maximize my revenue" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:3 -msgid "Cross-selling: Accessory and Optional Products" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:5 -msgid "" -"Any sales process is an opportunity to maximize revenues. For example, with " -"an extended warranty or some accessories." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:8 -msgid "" -"To do so, you can use **Cross-selling**, a sales technique consisting in " -"selling a customer something in addition to the product or service they were" -" originally shopping for. It is a great way to maximize the value of each " -"one of your customers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:12 -msgid "It can be done via two different features:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:14 -msgid "" -":ref:`Accessory products <cross_selling/accessory>` on the checkout page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:15 -msgid "" -":ref:`Optional products <cross_selling/optional>` on a new :guilabel:`Add to" -" Cart` screen." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:20 -msgid "Accessory Products" -msgstr "附件產品" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:22 -msgid "" -"**Accessory Products** are products that are displayed when customers review" -" their cart before paying. As an example, you could suggest a mouse or a " -"keyboard when someone buys a computer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:25 -msgid "" -"To add *Accessory Products*, go to :menuselection:`Website --> Products --> " -"Products` and, under the :guilabel:`Sales Tab`, add your products to the " -":guilabel:`Accessory Products` field." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an accessory product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:32 -msgid "" -"Now, go to your website and add the product to your cart. On the payment " -"step, you can see your accessory products suggested to the customer." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "See of payment view and accessory product suggestion." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:40 -msgid "" -"`Odoo Tutorials: Alternative, Accessory, and Optional Products " -"<https://www.odoo.com/slides/slide/alternative-accessory-and-optional-" -"products-637>`_." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:46 -msgid "Optional Products" -msgstr "選配產品" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:48 -msgid "" -"**Optional products** are products directly related to an item. Each time " -"the product is added to a cart, a pop-up appears, suggesting other products " -"to buy." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:51 -msgid "" -"To enable optional products, go to :menuselection:`Website --> Configuration" -" --> Settings` and tick :guilabel:`Optional Products`. Then, go to " -":menuselection:`Website --> Products --> Products` and open the item you " -"want to add an optional product to. In the :guilabel:`Sales tab` of that " -"product, add as many optional products as you want." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Add an optional product to product form." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:60 -msgid "" -"From now, when a customer adds this product to their cart, a pop-up appears " -"and suggests also adding the optional product(s)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rstNone -msgid "Pop-up with optional products appears." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/cross_selling.rst:68 -msgid ":doc:`upselling`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:3 -msgid "Adapt prices to website visitors" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:5 -msgid "" -"This section sheds light on pricing features found in the eCommerce app:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:7 -msgid "force a price by geo-localization," -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:9 -msgid "let the customer choose the currency." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:11 -msgid "" -"As a pre-requisite, check out how to managing product pricing: " -":doc:`/applications/sales/sales/products_prices/prices/pricing`)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:15 -msgid "Geo-IP automatically applies the right price" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:17 -msgid "" -"Assign country groups to your pricelists. That way, visitors who aren't " -"logged in yet will get their own currency when landing on your website." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:20 -msgid "Once logged in, they get the pricelist matching their country." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:23 -msgid "Currency selector" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:25 -msgid "" -"In the case that you sell in several currencies, you can let your customers " -"choose their own. Check the *Selectable* box to add the pricelist to the " -"website drop-down menu, which can be found in *Pricelists* under the " -"*Products* menu, located in the Website application." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:35 -msgid ":doc:`/applications/sales/sales/products_prices/prices/pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:36 -msgid ":doc:`/applications/sales/sales/products_prices/prices/currencies`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/pricing.rst:37 -msgid ":doc:`promo_code`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:3 -msgid "How to create & share promotional codes" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:5 -msgid "" -"Want to boost your sales for Xmas? Share promocodes through your marketing " -"campaigns and apply any kind of discounts." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:9 -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:13 -#: ../../content/applications/websites/website/publish/multi_website.rst:18 -msgid "Setup" -msgstr "設定" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:11 -msgid "" -"Go to :menuselection:`Sales --> Settings` and choose *Advanced pricing based" -" on formula* for *Sale Price*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:14 -msgid "" -"Go to :menuselection:`Website Admin --> Catalog --> Pricelists` and create a" -" new pricelist with the discount rule (see :doc:`pricing`). Then enter a " -"code." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:21 -msgid "" -"Make the promocode field available on your *Shopping Cart* page (option in " -"*Customize* menu). Add a product to cart to reach it." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:27 -msgid "" -"Once turned on you see a new section on the right side. On clicking *Apply* " -"prices get automatically updated in the cart." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:33 -msgid "" -"The promocode used by the customer is stored in the system so you can " -"analyze the performance of your marketing campaigns." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:39 -msgid "Show sales per pricelists..." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/promo_code.rst:43 -msgid ":doc:`pricing`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:3 -msgid "How to enable comments & rating" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:5 -msgid "" -"Publishing and monitoring customer experience will help you gain the trust " -"of new customers and better engage with your community. In 2 clicks, allow " -"your customer to share their feedback!" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:15 -msgid "" -"Activate comments & rating from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:21 -msgid "" -"Visitors must log in to share their comments. Make sure they are able to do " -"so (see Portal documentation)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:25 -msgid "Review the posts in real time" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:27 -msgid "" -"Whenever a post is published, the product manager and all the product " -"followers get notified in their Inbox (*Discuss* menu)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:34 -msgid "" -"By default the user who created the product is automatically set as " -"follower." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:36 -msgid "" -"Click the product name to open the detail form and review the comment (in " -"the product discussion thread)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:43 -msgid "Moderate & unpublish" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:45 -msgid "" -"You can easily moderate by using the chatter, either in the product detail " -"form or on the web page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:48 -msgid "" -"To unpublish the post, open the product web page and click the *Published* " -"button to turn it red (*Unpublished*)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:56 -msgid "..tip::" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/reviews.rst:55 -msgid "" -"You can access the web page from the detail form by clicking the *Published*" -" smart button (and vice versa)." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:3 -msgid "How to sell pricier alternative products (upselling)" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:5 -msgid "" -"In order to maximize your revenue, suggesting pricier alternative products " -"is strongly advised for basic items. That way, your customer will spend more" -" time browsing your catalog." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:12 -msgid "To do so:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:14 -msgid "" -"Select such *Alternative Products* in the *Sales* tab of the product detail " -"form. 3 alternatives are fine! Don't publish too many otherwise your " -"customers will be confused." -msgstr "" - -#: ../../content/applications/websites/ecommerce/maximizing_revenue/upselling.rst:20 -msgid "" -"Turn on *Alternative Products* from the *Customize* menu of the product web " -"page." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience.rst:5 -msgid "Get paid" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:3 -msgid "Manage orders paid with Payment Providers" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:5 -msgid "" -"The moment a payment is officially authorized by a Payment Provider, Odoo " -"*automatically* confirms the order, which triggers the delivery. And, if you" -" invoice based on ordered quantities, you are requested to invoice the " -"order, as well." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:9 -msgid "" -"Let’s take a closer look at how to manage orders paid with Payment " -"Providers." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:12 -msgid "Checking the status of a payment" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:14 -msgid "" -"To check the status of a payment, go to :menuselection:`Website --> Orders " -"--> Orders`. Then, simply click on the order you wish to check on." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:17 -msgid "" -"Once you are on the Sales Order page, you will find the payment is confirmed" -" with an automatic note in the *Chatter*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "payment is confirmed in the chatter of sales order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:24 -msgid "" -"If the user decides to create an invoice, the payment is directly " -"reconciled. This note in the *Chatter* includes a link to the Payment entry," -" which contains various details about the transaction, along with a link to " -"the related Journal Entry." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "page with details surrounding the specific transaction" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:32 -msgid "" -"Specific messages are provided to your customers for every payment status " -"whenever they are redirected to Odoo after the transaction. To edit these " -"messages, go to the *Messages* tab of the payment method." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:38 -msgid "Automatically generate invoices at order" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:40 -msgid "" -"When the order is confirmed, you can also choose to have an invoice " -"automatically issued and paid. This fully-automated feature is designed for " -"businesses that invoice orders right away." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "To do automatically generate invoices at order:" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:45 -msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings --> Invoicing`." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:46 -msgid "" -"Then, under the **Invoicing Policy** option, select *Invoice what is " -"ordered*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:47 -msgid "Then activate *Automatic Invoices* and *Save*." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rstNone -msgid "example of automatic invoice" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:54 -msgid "Capture payment after the delivery" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:56 -msgid "" -"If the provider handling the payment is configured to capture amounts " -"manually, the order is confirmed, but the amount is kept on hold. Once the " -"delivery is processed, you can capture the payment from the related Sales " -"Order." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:61 -msgid ":doc:`../../../finance/payment_providers`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/payment_providers.rst:62 -msgid "" -":ref:`Payment Providers: Place a hold on a card " -"<payment_providers/features/manual_capture>`" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:5 -msgid "" -"It has never been so easy for your customers to access their customer " -"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" -" suggested to sign up (name, email, password) when the order is placed, and " -"not before. Indeed, nothing is more annoying than going through a signup " -"process before buying something." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:14 -msgid "Sign up" -msgstr "註冊" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:16 -msgid "" -"The invitation to sign up shows up when the customer wants to visualize the " -"order from order confirmation email." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:23 -msgid "Customer account" -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:25 -msgid "" -"Once logged in the customer will access the account by clicking *My Account*" -" in the login dropdown menu." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:31 -msgid "" -"THere they find all their history. The main address (billing) can also be " -"modified." -msgstr "" - -#: ../../content/applications/websites/ecommerce/shopper_experience/portal.rst:37 -msgid "" -"If the customer is set as a contact of a company in your address book, they " -"will see all the documents whose the customer belongs to this company." -msgstr "" - -#: ../../content/applications/websites/ecommerce/taxes.rst:5 -msgid "Collect taxes" -msgstr "" - -#: ../../content/applications/websites/livechat.rst:8 +#: ../../content/applications/websites/livechat.rst:6 msgid "Live Chat" msgstr "線上客服" -#: ../../content/applications/websites/livechat.rst:11 -msgid "`Live Chat: product page <https://www.odoo.com/app/live-chat>`_" -msgstr "" - -#: ../../content/applications/websites/livechat/overview.rst:5 -#: ../../content/applications/websites/website/publish/translate.rst:6 -msgid "Overview" -msgstr "概覽" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:3 -msgid "Get Started with Live Chat" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:5 +#: ../../content/applications/websites/livechat.rst:8 msgid "" "Live Chat has the highest satisfaction rating of any communication tool. It " "allows fast responses and it is accessible and convenient, as your customers" @@ -912,11 +2528,23 @@ msgid "" "your customers want to talk to you, so let's make it easy." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:10 +#: ../../content/applications/websites/livechat.rst:13 +msgid "`Live Chat: product page <https://www.odoo.com/app/live-chat>`_" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:14 +msgid ":doc:`livechat/ratings`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:15 +msgid ":doc:`livechat/responses`" +msgstr "" + +#: ../../content/applications/websites/livechat.rst:18 msgid "Set up" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:12 +#: ../../content/applications/websites/livechat.rst:20 msgid "" "Once *Live Chat* is installed on your database, if your website was created " "with Odoo, the application is automatically added to it. All that is left to" @@ -924,284 +2552,282 @@ msgid "" "Live Chat`." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the settings page and the live chat feature for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:21 +#: ../../content/applications/websites/livechat.rst:28 msgid "" "Select the channel to be linked to your website or create one on the fly." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a live chat channel form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:27 +#: ../../content/applications/websites/livechat.rst:33 msgid "For both scenarios, under:" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:30 +#: ../../content/applications/websites/livechat.rst:36 msgid "" "- **Operators**: add agents to respond to the chat requests. Add as many as " "you like, and keep in mind that operators that do not show any activity in " "Odoo for more than 30min are considered disconnected." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:33 +#: ../../content/applications/websites/livechat.rst:39 msgid "" "- **Options**: set the default text to be shown on the live chat button; an " "automated welcome message to be seen by visitors when a conversation is " "initiated, and the text that prompts the user to initiate a chat." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:36 +#: ../../content/applications/websites/livechat.rst:42 msgid "" "- **Channel Rules**: choose an action for a given URL, and/or per country. " "In the example below, the chat window automatically pops-up 3 seconds after " "users (from any country) land on the contact us page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of a channel’s rules form for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:43 +#: ../../content/applications/websites/livechat.rst:48 msgid "" "GeoIP, which refers to the process of finding a computer terminal’s " "geographical location by its IP address, must be installed on your server. " "Otherwise, under *Channel Rules*, countries are not taken into account." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:48 +#: ../../content/applications/websites/livechat.rst:53 msgid "External options" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:51 +#: ../../content/applications/websites/livechat.rst:56 msgid "" "If your website was not created with Odoo, you can find the code to be added" " to your own, under the *Widget* tab." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:52 +#: ../../content/applications/websites/livechat.rst:57 msgid "" "Odoo also offers an URL you can send to users so they can have access to a " "single live chat page." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "View of the widget tab for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:59 +#: ../../content/applications/websites/livechat.rst:63 msgid "Managing chat requests" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:61 +#: ../../content/applications/websites/livechat.rst:65 msgid "" "Conversations initiated by visitors pop up as a direct message, and are " "shown in *Discuss*. Therefore, inquiries can be answered wherever you are in" " Odoo." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of the discuss application with a message sent through live chat in " "Odoo" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:69 +#: ../../content/applications/websites/livechat.rst:72 msgid "" "Conversations are dispatched based on the current workload of the online " "operators." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:72 +#: ../../content/applications/websites/livechat.rst:75 msgid "Leave or join a channel" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:74 +#: ../../content/applications/websites/livechat.rst:77 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel under *Live Chat*, and *Join Channel* or *Leave Channel*." msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rstNone +#: ../../content/applications/websites/livechat.rst-1 msgid "" "View of a channel form and the option to join a channel for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/get_started.rst:82 -#: ../../content/applications/websites/livechat/overview/responses.rst:48 -msgid ":doc:`ratings`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/get_started.rst:83 -#: ../../content/applications/websites/livechat/overview/ratings.rst:45 -msgid ":doc:`responses`" -msgstr "" - -#: ../../content/applications/websites/livechat/overview/ratings.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:3 msgid "Ratings" msgstr "點評" -#: ../../content/applications/websites/livechat/overview/ratings.rst:5 +#: ../../content/applications/websites/livechat/ratings.rst:5 msgid "" "Giving users the opportunity to rate their interactions can help you " "improving the experience you offer. That means staying on top of your " "customers' needs, besides keeping track of your operators’ performances." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:10 +#: ../../content/applications/websites/livechat/ratings.rst:10 msgid "Customer Rating" msgstr "客戶點評" -#: ../../content/applications/websites/livechat/overview/ratings.rst:12 +#: ../../content/applications/websites/livechat/ratings.rst:12 msgid "" "Once the user chooses to close the chat window, he can rate his interaction." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:14 +#: ../../content/applications/websites/livechat/ratings.rst:14 msgid "" "If the user is *Not satisfied* or *Highly dissatisfied*, a field allowing " "for an explanation is shown." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:15 +#: ../../content/applications/websites/livechat/ratings.rst:15 msgid "A copy of the conversation can also be sent by email." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the chat window from a user’s side for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:22 +#: ../../content/applications/websites/livechat/ratings.rst:22 msgid "The rating is shown on the chat window itself for the operator." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "" "View of a chat window from an operator’s side highlighting a rating for Odoo" " Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:28 +#: ../../content/applications/websites/livechat/ratings.rst:28 msgid "And under :menuselection:`Report --> Customer Ratings`." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the customer ratings page in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:35 +#: ../../content/applications/websites/livechat/ratings.rst:35 msgid "Make the rating public" msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rst:37 +#: ../../content/applications/websites/livechat/ratings.rst:37 msgid "" "Go to :menuselection:`Website --> Configuration --> Settings`, access your " "channel form, click on *Go to Website* and on *Unpublished*, to publish the " "rating of that channel on your website." msgstr "" -#: ../../content/applications/websites/livechat/overview/ratings.rstNone +#: ../../content/applications/websites/livechat/ratings.rst-1 msgid "View of the public ratings in the website for Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:3 +#: ../../content/applications/websites/livechat/ratings.rst:45 +msgid ":doc:`responses`" +msgstr "" + +#: ../../content/applications/websites/livechat/responses.rst:3 msgid "Commands and Canned Responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:5 +#: ../../content/applications/websites/livechat/responses.rst:5 msgid "" "Using canned responses can help you save time and have a previous, well-" "thought response, to some of your most common questions and comments." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:9 +#: ../../content/applications/websites/livechat/responses.rst:9 msgid "Use commands" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:11 +#: ../../content/applications/websites/livechat/responses.rst:11 msgid "" "Commands are shortcuts that do specific actions within the chat window:" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:13 +#: ../../content/applications/websites/livechat/responses.rst:13 msgid "**/help**: shows a help message." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:14 +#: ../../content/applications/websites/livechat/responses.rst:14 msgid "**/helpdesk**: creates a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:15 +#: ../../content/applications/websites/livechat/responses.rst:15 msgid "**/helpdesk_search**: searches for a helpdesk ticket." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:16 +#: ../../content/applications/websites/livechat/responses.rst:16 msgid "**/history**: shows the last 15 visited pages." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:17 +#: ../../content/applications/websites/livechat/responses.rst:17 msgid "**/lead**: creates a new lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:18 +#: ../../content/applications/websites/livechat/responses.rst:18 msgid "**/leave**: leaves the channel." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *helpdesk tickets*: make sure the application is installed on your " "database and the option *Live Chat* under :menuselection:`Helpdesk --> " "Configuration --> Helpdesk Teams` is enabled." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:0 +#: ../../content/applications/websites/livechat/responses.rst:0 msgid "" "- For *leads*: the *CRM* application must be installed on your database." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:26 +#: ../../content/applications/websites/livechat/responses.rst:26 msgid "" "To access the ticket or lead created from the chat, click on the shortcut " "link." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of the chat window with a helpdesk ticket created in Odoo Live Chat" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:33 +#: ../../content/applications/websites/livechat/responses.rst:33 msgid "" "Helpdesk tickets created from the chat automatically add the conversation as" " a description of the ticket. The same goes for the creation of a lead." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:37 +#: ../../content/applications/websites/livechat/responses.rst:37 msgid "Send canned responses" msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:40 +#: ../../content/applications/websites/livechat/responses.rst:40 msgid "" "Canned responses allow you to have a full piece of text being placed when " "you type a shortcut word. To create them, go to :menuselection:`Live Chat " "--> Configuration --> Canned Responses`." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rst:41 +#: ../../content/applications/websites/livechat/responses.rst:41 msgid "" "To use them during a conversation, simply type **:** followed by the " "shortcut word you created." msgstr "" -#: ../../content/applications/websites/livechat/overview/responses.rstNone +#: ../../content/applications/websites/livechat/responses.rst-1 msgid "" "View of a chat window and the use of a canned response in Odoo Live Chat" msgstr "" +#: ../../content/applications/websites/livechat/responses.rst:48 +msgid ":doc:`ratings`" +msgstr "" + #: ../../content/applications/websites/website.rst:8 msgid "Website" msgstr "網站" @@ -1212,254 +2838,807 @@ msgid "" "beautiful websites that convert visitors into leads or revenues." msgstr "" -#: ../../content/applications/websites/website/optimize.rst:5 -msgid "Optimize" -msgstr "最佳化" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:3 -msgid "How to track your website's traffic in Google Analytics" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:3 +msgid "Cookies bar" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:5 -msgid "To follow your website's traffic with Google Analytics:" -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:7 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:5 msgid "" -"`Create a Google Analytics account <https://www.google.com/analytics/>`__ if" -" you don't have any." +"Cookies are small text files sent to your device when you visit a website. " +"They are processed and stored by your browser and contain information about " +"your visit, such as login data, location, language, etc. There are two main " +"types of cookies:" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:10 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:9 msgid "" -"Go through the creation form and accept the conditions to get the tracking " -"ID." +"Essential cookies, which are necessary for the website to function properly;" msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:15 -msgid "Copy the tracking ID to insert it in Odoo." -msgstr "" - -#: ../../content/applications/websites/website/optimize/google_analytics.rst:20 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:10 msgid "" -"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " -"turn on Google Analytics and paste the tracking ID. Then save the page." +"Non-essential or optional cookies, which are used to analyze your behavior " +"or display advertisements." msgstr "" -#: ../../content/applications/websites/website/optimize/google_analytics.rst:27 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Example of a cookies bar with the popup layout." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:17 msgid "" -"To make your first steps in Google Analytics, refer to `Google Documentation" -" <https://support.google.com/analytics/answer/1008015?hl=en/>`_." +"Notifying users about data collection, as well as its methods and purposes, " +"is required by data protection laws such as `GDPR <https://gdpr.eu>`_. " +"Cookies bars are commonly used to fulfill this obligation in a user-friendly" +" and transparent manner. They are displayed immediately upon a user's first " +"visit to inform them that the website uses cookies and let them decide " +"whether they want to store non-essential cookies on their device." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:3 -msgid "Track clicks and visitors using Link Trackers" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:5 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:26 msgid "" -"Link Trackers allow you to track your marketing campaigns (emails, banner " -"ads, blog posts, social media posts, affiliate links, etc.). This way, you " -"are able to identify your best traffic sources and make informed decisions " -"about the distribution of your marketing budget." +"To enable the cookies bar on your Odoo website, go to " +":menuselection:`Website --> Configuration` and enable :guilabel:`Cookies " +"Bar` in the :guilabel:`Privacy` section." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:10 -msgid "Configuration" -msgstr "配置" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:12 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:29 msgid "" -"Go to :menuselection:`Website --> Configuration --> Settings` and activate " -"*Link Trackers*." +"You can :ref:`customize the appearance of your cookies bar <cookies-" +"bar/customization>` and :ref:`edit the content of the related Cookie Policy " +"page <cookies-bar/policy>`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:35 +msgid "Customization" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:37 msgid "" -"View of Website settings page emphasizing the link trackers field in Odoo " -"Website" +"To adapt the display of the cookies bar, click :guilabel:`Edit` and select " +"the :guilabel:`Cookies Bar` building block in the :guilabel:`Invisible " +"Elements` at the bottom of the panel. Customize it using the options in the " +":guilabel:`Customize` tab in the edit panel. Three :guilabel:`Layouts` are " +"available:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:19 -msgid "Set up traceable URLs" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:42 +msgid ":guilabel:`Discrete`: thin bar" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:21 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:43 +msgid ":guilabel:`Classic`: banner" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:44 msgid "" -"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " -"page`. Here, you are able to get a specific tracked URL based on the " -"campaign, medium, and source being used." +":guilabel:`Popup`: you can change the popup's :guilabel:`Position` to the " +":guilabel:`Top`, :guilabel:`Middle`, or :guilabel:`Bottom` of the screen." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone -msgid "View of the link tracker fields for Odoo Website" +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:47 +msgid "You can also:" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:28 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:49 +msgid "modify the :guilabel:`Size` of the cookies bar;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:50 msgid "" -"**URL**: url of the page you want to track (e.g. the home page or a " -"product's page)." +"enable :guilabel:`Backdrop` to gray out the page in the background when the " +"cookies bar is displayed on the screen;" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:29 -msgid "**Campaign**: context of your link (e.g. a special promotion)." -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:30 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:52 msgid "" -"**Medium**: channel used to share (deliver) your link (e.g. an email or a " -"Facebook ad)." +"further customize the appearance of the cookies bar using :guilabel:`Block` " +"and/or :guilabel:`Column` customization options, which are available after " +"clicking anywhere in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:31 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:56 msgid "" -"**Source**: platform where the traffic originates (e.g. Google or Twitter)." +"To edit the contents of the cookies bar (i.e., the consent message), click " +"directly in the building block." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:33 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst-1 +msgid "Odoo Website's edit panel to customize the cookies bar." +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:65 +msgid "Cookie policy" +msgstr "" + +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:67 msgid "" -"Now, click on *Get tracked link* to generate a URL that you can post or send" -" by the source you have decided on." +"When you enable the cookies bar for your website, Odoo creates the **Cookie " +"Policy** page (`/cookie-policy`) with the list of essential and optional " +"cookies. To access it, click the :guilabel:`Cookie Policy` hyperlink in the " +"cookies bar or open the page from :menuselection:`Website --> Site --> " +"Pages`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:37 -msgid "Follow-up on tracked links" -msgstr "" - -#: ../../content/applications/websites/website/optimize/link_tracker.rst:39 +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:72 msgid "" -"To look at statistics of your links, go to :menuselection:`Website --> Go to" -" website --> Promote --> Track this page`. Besides being able to see the " -"*Most Clicked* and *Recently Used* links, you can also see complete " -"statistics by clicking on *Stats*, including the number of clicks, and the " -"country of origin for those clicks." +"The contents of the page can be adapted based on your website's features and" +" characteristics if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rstNone +#: ../../content/applications/websites/website/configuration/cookies_bar.rst:76 msgid "" -"View of the tracked list emphasizing the statistics buttons in Odoo Website" +"You could add a link providing access to this page, in your website's " +"footer, for example." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:50 -msgid "You can also access the link tracker on *odoo.com/r* via your browser." +#: ../../content/applications/websites/website/configuration/multi_website.rst:3 +msgid "Multiple websites" msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:51 +#: ../../content/applications/websites/website/configuration/multi_website.rst:5 msgid "" -"Activate the developer mode (:menuselection:`Settings --> Activate the " -"developer mode`) and get access to the *Link Tracker* module and its back-" -"end functionalities." +"Odoo allows you to create multiple websites from the same database. This can" +" be useful, for example, if you have multiple brands operating under your " +"organization, or to create separate websites for different " +"products/services, or different audiences. In these cases, having different " +"websites can help avoid confusion and make it easier to tailor your digital " +"outreach strategies and reach your target audience." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:53 +#: ../../content/applications/websites/website/configuration/multi_website.rst:11 msgid "" -"Integrated with :doc:`Google Analytics <google_analytics>`, those trackers " -"allow you to see the number of clicks and visitors to keep you on top of " -"your marketing campaigns." +"Each website can be designed and configured independently with its own " +":doc:`domain name </administration/maintain/domain_names>`, theme, pages, " +"menus, :doc:`languages <translate>`, :doc:`products " +"<../../ecommerce/managing_products/products>`, assigned sales team, etc. " +"They can also :ref:`share content and pages <multi-" +"website/website_content>`." msgstr "" -#: ../../content/applications/websites/website/optimize/link_tracker.rst:55 +#: ../../content/applications/websites/website/configuration/multi_website.rst:18 msgid "" -"The integration with the :doc:`CRM " -"</applications/sales/crm/track_leads/prospect_visits>` application allows " -"you to understand where your leads and opportunities are coming from." +"Duplicate content (i.e., pages and content shared between multiple websites)" +" can have a negative impact on :doc:`../pages/seo`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:3 -msgid "Website analytics with Plausible.io" +#: ../../content/applications/websites/website/configuration/multi_website.rst:22 +msgid "Website creation" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:5 -msgid "To follow your website's traffic with Plausible.io:" +#: ../../content/applications/websites/website/configuration/multi_website.rst:24 +msgid "To create a new website, proceed as follows:" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:7 +#: ../../content/applications/websites/website/configuration/multi_website.rst:26 +#: ../../content/applications/websites/website/configuration/multi_website.rst:142 +msgid "Go to :menuselection:`Website --> Configuration --> Settings`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:27 +msgid "Click :guilabel:`+ New Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "New website button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:32 msgid "" -"`Create a Plausible.io account <https://plausible.io/register>`_ if you " -"don't have any." +"Specify the :guilabel:`Website Name` and :guilabel:`Website domain`. Each " +"website must be published under its own :doc:`domain " +"</administration/maintain/domain_names>`." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:8 +#: ../../content/applications/websites/website/configuration/multi_website.rst:34 msgid "" -"`Create your website <https://plausible.io/sites/new>`_ and `Start " -"collecting data` if it is not already done." +"Adapt the :guilabel:`Company name`, :guilabel:`Languages` and " +":guilabel:`Default language` if needed." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:10 +#: ../../content/applications/websites/website/configuration/multi_website.rst:36 +msgid "Click the :guilabel:`Create` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:38 +msgid "You can then start building your new website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:41 msgid "" -"Go through the `list of your websites <https://plausible.io/sites>`_ and " -"click on the gear icon." +"By default, all website-related apps that you have installed (e.g. " +"**eCommerce**, **Forum**, **Blog**, etc.) and their related website pages " +"are also available on the new website. You can remove them by amending the " +"website's menu." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Click on cog icon in the list of websites" +#: ../../content/applications/websites/website/configuration/multi_website.rst:46 +msgid "Switching websites" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:16 +#: ../../content/applications/websites/website/configuration/multi_website.rst:48 msgid "" -"Click on the button :guilabel:`+ New Link` in the tab Visibility to create " -"your Shared links." +"To switch from one website to another, click the menu next to the " +":guilabel:`+New` button in the top right corner and select the website you " +"want to switch to." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Adding a shared link in the Visibility tab" +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website selector" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:22 +#: ../../content/applications/websites/website/configuration/multi_website.rst:55 msgid "" -"Choose a name (and NO password - it is not supported to embed it in Odoo) " -"and click on the button `Create Shared Link`." +"When you switch websites, you are redirected to the other website, to the " +"same page (URL) as the current one. If the page you are currently viewing " +"does not exist on the other website, you are redirected to a 404 error page." +" Once redirected, click :guilabel:`Create page` to create the page." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Credentials creation for the new shared link" +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Create a page from a 404 error page" msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:29 +#: ../../content/applications/websites/website/configuration/multi_website.rst:64 +msgid "Website-specific configuration" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:66 msgid "" -"Copy the new Shared Link URL from Plausible.io and paste it into the " -"Settings of Odoo." +"Most website settings are website-specific, which means they can be " +"enabled/disabled per website. To adapt the settings for a website, go to " +":menuselection:`Website --> Configuration --> Settings`. Select the desired " +"website in the field :guilabel:`Settings of Website` at the top of the " +":guilabel:`Settings` page, in the **yellow** banner. Then, adapt the options" +" for that specific website." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Copy the shared link URL from Plausible.io" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "Paste the shared link URL to Odoo settings" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "**You are on the Odoo Online Platform**" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 +#: ../../content/applications/websites/website/configuration/multi_website.rst:73 msgid "" -"When you `create your Odoo Online database <https://www.odoo.com/trial>`_, " -"we create it for you on our own server. You don't have anything to do." +"Websites are created with the default settings; the settings are not copied " +"from one website to the other." msgstr "" -#: ../../content/applications/websites/website/optimize/plausible.rst:0 -msgid "**What about the Goal?**" -msgstr "" - -#: ../../content/applications/websites/website/optimize/plausible.rst:0 +#: ../../content/applications/websites/website/configuration/multi_website.rst:75 msgid "" -"Odoo pushes out-of-the-box custom events: `Lead Generation` and `Shop`." +"In a :doc:`multi-company environment <../../../general/users/companies>`, " +"each website can be linked to a specific company in your database so that " +"only company-related data (e.g., products, jobs, events, etc.) is displayed " +"on the website. To display company-specific data, set the desired company in" +" the :guilabel:`Company` field." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:3 -msgid "How to do Search Engine Optimisation (SEO) in Odoo" +#: ../../content/applications/websites/website/configuration/multi_website.rst:83 +msgid "Content availability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:5 +#: ../../content/applications/websites/website/configuration/multi_website.rst:85 +msgid "" +"By default, pages, products, events, etc. created from the frontend (using " +"the :guilabel:`+New` button) are only available on the website from which it" +" was created. Records created from the backend, however, are made available " +"on all websites by default. The content's availability can be changed in the" +" backend, in the :guilabel:`Website` field. For example, for products, go to" +" :menuselection:`eCommerce --> Products`, then select the product and go to " +"the :guilabel:`Sales` tab. For forums, go to :menuselection:`Configuration " +"--> Forums`, then select the forum." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Website field in Forum form" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:98 +msgid "Records and features can be made available:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:100 +msgid "On all websites: leave the :guilabel:`Website` field empty;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:101 +msgid "Only on one website: set the :guilabel:`Website` field accordingly;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:102 +msgid "" +"On some websites: in this case, you should duplicate the item and set the " +":guilabel:`Website` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:106 +msgid "Website pages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:108 +msgid "" +"To modify the website on which a page is to be published, proceed as " +"follows:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:110 +msgid "Go to :menuselection:`Website --> Site --> Pages`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:111 +msgid "Select the website on which the page is currently published." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:0 +msgid "Display pages per website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:116 +msgid "Tick the check box next to the page(s) you want to change." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:117 +msgid "" +"Click the :guilabel:`Website` field and select the website, or empty it to " +"publish the page on all websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:121 +msgid "" +"Each website must have its own homepage; you may not use the same homepage " +"for several websites." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:124 +msgid "eCommerce features" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:126 +msgid "" +"eCommerce features such as products, eCommerce categories, pricelists, " +"discounts, payment providers, etc. can be restricted to :ref:`a specific " +"website <website_field>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:132 +msgid "" +"You can :doc:`allow your customers to use the same account " +"<../../ecommerce/ecommerce_management/customer_accounts>` on all of your " +"websites by enabling the :guilabel:`Shared Customer Accounts` check box in " +"the website settings." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:137 +msgid "Pricing" +msgstr "價目表" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:139 +msgid "" +"Products can be priced differently based on the website using " +":ref:`pricelists <ecommerce/pricelists>`. The following configuration is " +"required:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:143 +msgid "" +"Scroll down to the :guilabel:`Shop - Products` section and select the " +":guilabel:`Pricelists` option :guilabel:`Multiple prices per product`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:145 +msgid "" +"Click :guilabel:`Pricelists` to define new pricelists or edit existing ones." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:146 +msgid "" +"Select the pricelist or click :guilabel:`New` to create a new one, then " +"select the :guilabel:`Configuration` tab and set the :guilabel:`Website` " +"field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:150 +#: ../../content/applications/websites/website/reporting.rst:5 +msgid "Reporting" +msgstr "報告" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:155 +msgid "" +"Each website has its own :doc:`analytics <../reporting/plausible>`. To " +"switch between websites, click the buttons in the upper right corner." +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst-1 +msgid "Switch websites in analytics" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:162 +msgid "Other reporting data" +msgstr "" + +#: ../../content/applications/websites/website/configuration/multi_website.rst:164 +msgid "" +"Other reporting data such as eCommerce dashboard data, online sales analyses" +" and visitors can be grouped by website if necessary. Click :guilabel:`Group" +" by --> Website`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:3 +msgid "Geo IP Installation (On-Premises Database)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:6 +msgid "Installation" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:9 +msgid "" +"Please note that the installation depends on your computer's operating " +"system and distribution. We will assume that a Linux operating system is " +"being used." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:15 +msgid "Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:17 +msgid "" +"Download the `GeoLite2 City database " +"<https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with a" +" file called ``GeoLite2-City.mmdb``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:22 +msgid "Move the file to the folder ``/usr/share/GeoIP/``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:24 +msgid "Restart the server" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:27 +msgid "" +"If you can't/don't want to locate the geoip database in " +"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " +"command line interface. This option takes the absolute path to the GeoIP " +"database file and uses it as the GeoIP database. For example:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:36 +msgid ":doc:`CLI documentation </developer/reference/cli>`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:39 +msgid "" +"``GeoIP`` Python library can also be used. However this version is " +"discontinued since January 1. See `GeoLite Legacy databases are now " +"discontinued <https://support.maxmind.com/geolite-legacy-discontinuation-" +"notice/>`_" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:44 +msgid "How To Test GeoIP Geolocation In Your Odoo Website" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:46 +msgid "Go to your website. Open the web page that you want to test ``GeoIP``." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:47 +msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:48 +msgid "Add the following piece of XML in the page :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:54 +msgid "" +"You should end up with a dictionary indicating the location of the IP " +"address." +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:60 +msgid "" +"If the curly braces are empty ``{}``, it can be for any of the following " +"reasons :" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:62 +msgid "" +"The browsing IP address is the localhost (``127.0.0.1``) or a local area " +"network one (``192.168.*.*``)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:64 +msgid "" +"If a reversed proxy is used, make sure to configure it correctly. See " +":option:`proxy mode <odoo-bin --proxy-mode>`" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:66 +msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" +msgstr "" + +#: ../../content/applications/websites/website/configuration/on-premise_geo-ip-installation.rst:67 +msgid "The GeoIP database was unable to resolve the given IP address" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:3 +msgid "Translations" +msgstr "翻譯" + +#: ../../content/applications/websites/website/configuration/translate.rst:5 +msgid "" +"The contents of your website pages (i.e., text strings) can be translated " +"into different languages directly on your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:8 +msgid "" +"Your website is displayed in the language that matches the visitor's " +"browser's language, unless that particular language has not been installed. " +"In this case, the website is displayed in the :ref:`default language " +"<translate/default-language>`. The visitor can still select another language" +" in the language menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:14 +msgid "Installing languages" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:16 +msgid "" +"To translate your website, you first have to add the required languages:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:18 +msgid "Go to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:19 +msgid "Scroll to the bottom of the page to the **language menu**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:20 +msgid "Click the language and select :guilabel:`Add a language`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language to your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:25 +msgid "" +"Click the :guilabel:`Languages` field and select the required language from " +"the drop-down list. Repeat this step for each additional language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:27 +msgid "Click the :guilabel:`Add` button." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:30 +msgid "" +"You can also edit your website's languages from the backend, in the " +":guilabel:`Settings`. Go to :menuselection:`Website –> Configuration –> " +"Settings` and add/remove the required languages in the :guilabel:`Languages`" +" field, in the :guilabel:`Website info` section." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:37 +msgid "Default language" +msgstr "預設語系" + +#: ../../content/applications/websites/website/configuration/translate.rst:39 +msgid "" +"If the language of the visitor's browser is not installed on your website, " +"the content is displayed in the default language." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:42 +msgid "" +"To define a default language, go to :menuselection:`Website –> Configuration" +" –> Settings`, and select a language in the :guilabel:`Default` field." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:46 +msgid "" +"This field is visible only if multiple languages are already configured for " +"your website." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:49 +msgid "Translating the contents" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:51 +msgid "" +"Once the languages have been added, you can translate the contents of your " +"website. To do so, go to your website, select the language from the language" +" menu and click the :guilabel:`Translate` button on the right part of the " +"task bar to activate the **translation mode**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Translate button" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:58 +msgid "As a result:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:60 +msgid "" +"Text strings that have already been translated are highlighted in green;" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:61 +msgid "Text strings that need to be translated are highlighted in yellow." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst-1 +msgid "Text to be translated highlighted in yellow" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:66 +msgid "" +"You can then replace the original text with the translation by clicking the " +"block, editing its contents and saving." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:70 +msgid "" +"Once the languages have been installed, you can also translate some items " +"(e.g., the product's name and description) from the backend (e.g., in the " +"product template). To do so, click the language code (e.g., :guilabel:`EN`) " +"next to the text you want to translate (e.g., the product name) and add the " +"translation." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Translate product-related items." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:78 +msgid "" +"You can also :doc:`export/import translations " +"<../../../../developer/howtos/translations>` to translate multiple items " +"(e.g., product names and descriptions) in one go." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:82 +msgid "Language selector menu" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:84 +msgid "To add a language selector menu:" +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:86 +msgid "Go to your website and click :guilabel:`Edit`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:87 +msgid "" +"Select the block where you want to add the language selector menu (e.g., the" +" header)." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:88 +msgid "Select the :guilabel:`Customize` tab." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:89 +msgid "" +"In the :guilabel:`Navbar` section, set the :guilabel:`Language selector` " +"field to either :guilabel:`Dropdown` or :guilabel:`Inline`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:0 +msgid "Add a language selector menu." +msgstr "" + +#: ../../content/applications/websites/website/configuration/translate.rst:95 +msgid "Click :guilabel:`Save`." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:3 +msgid "Unsplash (free images)" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:6 +msgid "Generate an Unsplash access key" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:9 +msgid "" +"**As an Odoo Online user**, you are ready to use Unsplash. You won't need to" +" follow this guide to set up Unsplash information since you will use our own" +" Odoo Unsplash key in a transparent way." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:13 +msgid "Generate an Unsplash access key for non-Odoo Online users" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:15 +msgid "Create an account on `Unsplash.com <https://unsplash.com/join>`_." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:17 +msgid "" +"Go to your `applications dashboard " +"<https://unsplash.com/oauth/applications>`_ and click on **New " +"Application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:23 +msgid "Accept the conditions and click on **Accept terms**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:28 +msgid "" +"You will be prompted to insert an **Application name** and a " +"**Description**. Please prefix your application name by \"**Odoo:** \" so " +"that Unsplash can recognize it as an Odoo instance. Once done, click on " +"**Create application**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:35 +msgid "" +"You should be redirected to your application details page. Scroll down a bit" +" to find your **access key**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:42 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a " +"restriction of 50 Unsplash requests per hour." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:46 +msgid "Generate an Unsplash application ID" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:49 +msgid "You should first create and set up your Unsplash application." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:51 +msgid "" +"Go to your `applications dashboard " +"<https://unsplash.com/oauth/applications>`_ and click on your newly created " +"Unsplash application under **Your applications**." +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:57 +msgid "" +"You will be redirected to your application details page. The **application " +"ID** will be visible in your browser's URL. The URL should be something like" +" ``https://unsplash.com/oauth/applications/<application_id>``" +msgstr "" + +#: ../../content/applications/websites/website/configuration/unsplash.rst:65 +msgid "" +"**As a non-Odoo Online user**, you won't be able to register for a " +"production Unsplash key and will be limited to your test key that has a 50 " +"Unsplash requests per hour restriction." +msgstr "" + +#: ../../content/applications/websites/website/pages.rst:5 +msgid "Pages" +msgstr "不同頁面" + +#: ../../content/applications/websites/website/pages/seo.rst:3 +msgid "Search Engine Optimisation (SEO)" +msgstr "" + +#: ../../content/applications/websites/website/pages/seo.rst:5 msgid "" "Search Engine Optimization (SEO) is a set of good practices to optimize your" " website so that you get a better ranking in search engines like Google. In " "short, a good SEO allows you to get more visitors." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:9 +#: ../../content/applications/websites/website/pages/seo.rst:9 msgid "" "Some examples of SEO rules: your web pages should load fast, your page " "should have one and only one title ``<h1>``, meta tags (alt-tag, title-tag) " @@ -1467,28 +3646,28 @@ msgid "" "``/sitemap.xml`` file, etc." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:15 +#: ../../content/applications/websites/website/pages/seo.rst:15 msgid "" "To guarantee Odoo Website and Odoo eCommerce users have a great SEO, Odoo " "abstracts all the technical complexities of SEO and handles everything for " "you, in the best possible way. This will be explained here below." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:20 +#: ../../content/applications/websites/website/pages/seo.rst:20 msgid "" "But first, let see how you can easily boost your ranking by finetuning the " "content and the meta tags of your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:24 +#: ../../content/applications/websites/website/pages/seo.rst:24 msgid "Meta Tags" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:27 +#: ../../content/applications/websites/website/pages/seo.rst:27 msgid "Title, Description" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:29 +#: ../../content/applications/websites/website/pages/seo.rst:29 msgid "" "Every web page should define the ``<title>`` and ``<description>`` meta " "data. These information elements are used by search engines to promote your " @@ -1497,11 +3676,11 @@ msgid "" "otherwise you will be downgraded by search engines." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:39 +#: ../../content/applications/websites/website/pages/seo.rst:39 msgid "Keywords" msgstr "關鍵字" -#: ../../content/applications/websites/website/optimize/seo.rst:40 +#: ../../content/applications/websites/website/pages/seo.rst:41 msgid "" "In order to write quality content and boost your traffic, Odoo provides a " "``<keyword>`` finder. Those keywords are the searches you want to head " @@ -1510,28 +3689,28 @@ msgid "" "the related searches in Google. The more keywords are used the better." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:50 +#: ../../content/applications/websites/website/pages/seo.rst:51 msgid "" "If your website is in multiple languages, you can use the Promote tool for " "every language of a single page and set specific title, description and " "search tags." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:55 +#: ../../content/applications/websites/website/pages/seo.rst:56 msgid "Content is King" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:57 +#: ../../content/applications/websites/website/pages/seo.rst:58 msgid "" "When it comes to SEO, content is usually king. Odoo provides several modules" " to help you build your website content:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:60 +#: ../../content/applications/websites/website/pages/seo.rst:61 msgid "**Odoo Blogs**: write great contents." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:62 +#: ../../content/applications/websites/website/pages/seo.rst:63 msgid "" "**Odoo Slides**: publish all your Powerpoint or PDF presentations. Their " "content is automatically indexed on the web page. Example: " @@ -1539,147 +3718,147 @@ msgid "" "channel-1>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:66 +#: ../../content/applications/websites/website/pages/seo.rst:67 msgid "" "**Odoo Forum**: let your community create contents for you. Example: " "`odoo.com/forum/1 <https://odoo.com/forum/1>`_ (accounts for 30% of Odoo.com" " landing pages)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:70 +#: ../../content/applications/websites/website/pages/seo.rst:71 msgid "" "**Odoo Mailing List Archive**: publish mailing list archives on your " "website. Example: `odoo.com/groups/community-59 " "<https://www.odoo.com/groups/community-59>`_ (1000 pages created per month)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:76 +#: ../../content/applications/websites/website/pages/seo.rst:77 msgid "" "The 404 page is a regular page, that you can edit like any other page in " "Odoo. That way, you can build a great 404 page to redirect to the top " "content of your website when visitors get lost in invalid URLs." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:81 +#: ../../content/applications/websites/website/pages/seo.rst:82 msgid "Use Social Networks" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:83 +#: ../../content/applications/websites/website/pages/seo.rst:84 msgid "" "Social media is built for mass sharing. If lots of people share your content" " on social media, then it's likely more people will link to it, and links " "are a huge factor for SEO ranking." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:87 +#: ../../content/applications/websites/website/pages/seo.rst:88 msgid "Odoo embeds several tools to share content through social media:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:90 +#: ../../content/applications/websites/website/pages/seo.rst:91 msgid "Social Network" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:92 +#: ../../content/applications/websites/website/pages/seo.rst:93 msgid "" "Odoo allows to link all your social network accounts in your website footer." " All you have to do is to refer all your accounts in your company settings." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:99 +#: ../../content/applications/websites/website/pages/seo.rst:100 msgid "Social Share" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:101 +#: ../../content/applications/websites/website/pages/seo.rst:102 msgid "" "Drop the building block *Share* on any page you want your visitors to share." " By clicking the icon, they are prompted to share the page in their social " "media wall." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:108 +#: ../../content/applications/websites/website/pages/seo.rst:109 msgid "" "Most social media use a picture of the picture to decorate the share post. " "Odoo uses the website logo by default but you can choose any other image of " "your page in the Promote tool." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:116 +#: ../../content/applications/websites/website/pages/seo.rst:117 msgid "Facebook Page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:118 +#: ../../content/applications/websites/website/pages/seo.rst:119 msgid "" "Drop the building block *Facebook Page* to display a widget of your Facebook" " business page and encourage visitors to follow it. You can display the " "timeline, the next events and the messages." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:123 +#: ../../content/applications/websites/website/pages/seo.rst:124 msgid "Twitter Scroller" msgstr "推特捲軸" -#: ../../content/applications/websites/website/optimize/seo.rst:125 +#: ../../content/applications/websites/website/pages/seo.rst:126 msgid "" "Display the Twitter feeds with customer satifaction on your website. This " "will increase the number of tweets and shares." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:129 +#: ../../content/applications/websites/website/pages/seo.rst:130 msgid "Test Your Website" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:131 +#: ../../content/applications/websites/website/pages/seo.rst:132 msgid "" "You can compare how your website rank, in terms of SEO, against Odoo using " "WooRank free services: `woorank.com <https://www.woorank.com>`_" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:136 +#: ../../content/applications/websites/website/pages/seo.rst:137 msgid "URLs Handling" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:138 +#: ../../content/applications/websites/website/pages/seo.rst:139 msgid "This section sheds some light on how Odoo makes URLs SEO-friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:141 +#: ../../content/applications/websites/website/pages/seo.rst:142 msgid "URLs Structure" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:143 +#: ../../content/applications/websites/website/pages/seo.rst:144 msgid "A typical Odoo URL will look like this:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:145 +#: ../../content/applications/websites/website/pages/seo.rst:146 msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:147 +#: ../../content/applications/websites/website/pages/seo.rst:148 msgid "With the following components:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:149 +#: ../../content/applications/websites/website/pages/seo.rst:150 msgid "**https://** = Protocol" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:151 +#: ../../content/applications/websites/website/pages/seo.rst:152 msgid "**www.mysite.com** = your domain name" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:153 +#: ../../content/applications/websites/website/pages/seo.rst:154 msgid "" "**/fr\\_FR** = page language. This part of the URL is removed if the visitor" " browses the main language of the website Thus, the main version of this " "page is: https://www.mysite.com/shop/product/my-great-product-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:158 +#: ../../content/applications/websites/website/pages/seo.rst:159 msgid "" "**/shop/product** = every module defines its own namespace (/shop is for the" " catalog of the eCommerce module, /shop/product is for a product page)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:162 +#: ../../content/applications/websites/website/pages/seo.rst:163 msgid "" "**my-great-product** = by default, this is the slugified title of the " "product this page refers to. But you can customize it for SEO purposes. A " @@ -1688,100 +3867,100 @@ msgid "" "forum post, forum comment, product category, etc.)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:169 +#: ../../content/applications/websites/website/pages/seo.rst:170 msgid "**-31** = the unique ID of the product" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:171 +#: ../../content/applications/websites/website/pages/seo.rst:172 msgid "" "Note that any dynamic component of an URL can be reduced to its ID. As an " "example, the following URLs all do a 301 redirect to the above URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:174 +#: ../../content/applications/websites/website/pages/seo.rst:175 msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:176 +#: ../../content/applications/websites/website/pages/seo.rst:177 msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:178 +#: ../../content/applications/websites/website/pages/seo.rst:179 msgid "" "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product " "name)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:181 +#: ../../content/applications/websites/website/pages/seo.rst:182 msgid "" "Some URLs have several dynamic parts, like this one (a blog category and a " "post):" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:184 +#: ../../content/applications/websites/website/pages/seo.rst:185 msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:186 +#: ../../content/applications/websites/website/pages/seo.rst:187 msgid "In the above example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:188 +#: ../../content/applications/websites/website/pages/seo.rst:189 msgid "*Company News* is the title of the blog" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:190 +#: ../../content/applications/websites/website/pages/seo.rst:191 msgid "*The Odoo Story* is the title of a specific blog post" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:192 +#: ../../content/applications/websites/website/pages/seo.rst:193 msgid "" "When an Odoo page has a pager, the page number is set directly in the URL " "(does not have a GET argument). This allows every page to be indexed by " "search engines. Example:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:196 +#: ../../content/applications/websites/website/pages/seo.rst:197 msgid "https://www.odoo.com/blog/page/3" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:199 +#: ../../content/applications/websites/website/pages/seo.rst:200 msgid "Changes in URLs & Titles" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:201 +#: ../../content/applications/websites/website/pages/seo.rst:202 msgid "" "When the URL of a page changes (e.g. a more SEO friendly version of your " "product name), you don't have to worry about updating all links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:204 +#: ../../content/applications/websites/website/pages/seo.rst:205 msgid "Odoo will automatically update all its links to the new URL." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:206 +#: ../../content/applications/websites/website/pages/seo.rst:207 msgid "" "If external websites still points to the old URL, a 301 redirect will be " "done to route visitors to the new address of the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:209 +#: ../../content/applications/websites/website/pages/seo.rst:210 msgid "As an example, this URL:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:211 +#: ../../content/applications/websites/website/pages/seo.rst:212 msgid "http://mysite.com/shop/product/old-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:213 +#: ../../content/applications/websites/website/pages/seo.rst:214 msgid "Will automatically redirect to:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:215 +#: ../../content/applications/websites/website/pages/seo.rst:216 msgid "http://mysite.com/shop/product/new-and-better-product-name-31" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:217 +#: ../../content/applications/websites/website/pages/seo.rst:218 msgid "" "In short, just change the title of a blog post or the name of a product, and" " the changes will apply automatically everywhere in your website. The old " @@ -1789,11 +3968,11 @@ msgid "" "maintaining the SEO link juice." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:223 +#: ../../content/applications/websites/website/pages/seo.rst:224 msgid "HTTPS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:225 +#: ../../content/applications/websites/website/pages/seo.rst:226 msgid "" "Search engines boost ranking of secure HTTPS/SSL websites. So, by default " "all Odoo Online instances are fully based on HTTPS. If the visitor accesses " @@ -1801,84 +3980,84 @@ msgid "" "equivalent." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:231 +#: ../../content/applications/websites/website/pages/seo.rst:232 msgid "Links: Nofollow Strategy" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:233 +#: ../../content/applications/websites/website/pages/seo.rst:234 msgid "" "The more a page is linked from external and quality websites, the better it " "is for your SEO." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:236 +#: ../../content/applications/websites/website/pages/seo.rst:237 msgid "Here are Odoo strategies to manage links:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:238 +#: ../../content/applications/websites/website/pages/seo.rst:239 msgid "" "Every link you add to your website is \"dofollow\", which means that this " "link will contribute to the SEO Juice for the linked page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:242 +#: ../../content/applications/websites/website/pages/seo.rst:243 msgid "" "Every link posted by a contributor (forum post, blog comment, etc.) that " "links to your own website is \"dofollow\" too." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:245 +#: ../../content/applications/websites/website/pages/seo.rst:246 msgid "" "But every link posted by a contributor that links to an external website is " "\"nofollow\". In that way, you do not run the risk of people posting links " "on your website to third-party websites which have a bad reputation." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:250 +#: ../../content/applications/websites/website/pages/seo.rst:251 msgid "" "Note that, when using the forum, contributors having a lot of Karma can be " "trusted. In such case, their links will not have any ``rel=\"nofollow\"`` " "attribute." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:255 +#: ../../content/applications/websites/website/pages/seo.rst:256 msgid "Multi-Language Support" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:258 +#: ../../content/applications/websites/website/pages/seo.rst:261 msgid "Multi-Language URLs" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:260 +#: ../../content/applications/websites/website/pages/seo.rst:263 msgid "" "If you run a website in multiple languages, the same content will be " "available in different URLs, depending on the language used:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:263 +#: ../../content/applications/websites/website/pages/seo.rst:266 msgid "" "https://www.mywebsite.com/shop/product/my-product-1 (main language, English " "here)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:265 +#: ../../content/applications/websites/website/pages/seo.rst:268 msgid "" "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French " "version)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:267 +#: ../../content/applications/websites/website/pages/seo.rst:270 msgid "" "In this example, fr\\_FR is the language of the page. You can even have " "several variations of the same language: pt\\_BR (Portuguese from Brazil) , " "pt\\_PT (Portuguese from Portugal)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:272 +#: ../../content/applications/websites/website/pages/seo.rst:275 msgid "Language Annotation" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:274 +#: ../../content/applications/websites/website/pages/seo.rst:277 msgid "" "To let search engines know that the second URL is the French translation of " "the first URL, Odoo will add an HTML link element in the header. In the HTML" @@ -1886,34 +4065,34 @@ msgid "" "pointing to the translated versions of that webpage;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:279 +#: ../../content/applications/websites/website/pages/seo.rst:282 msgid "" "<link rel=\"alternate\" hreflang=\"fr\" " "href=\"https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1\"/>" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:282 +#: ../../content/applications/websites/website/pages/seo.rst:285 msgid "With this approach:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:284 +#: ../../content/applications/websites/website/pages/seo.rst:287 msgid "" "Search engines will redirect to the right language according to the visitor " "language." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:287 +#: ../../content/applications/websites/website/pages/seo.rst:290 msgid "" "You do not get penalized by search engines if your page is not translated " "yet. Indeed, it's not a duplicated content, but a different version of the " "same content." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:292 +#: ../../content/applications/websites/website/pages/seo.rst:295 msgid "Language Detection" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:294 +#: ../../content/applications/websites/website/pages/seo.rst:297 msgid "" "When a visitor lands for the first time on your website (e.g. " "yourwebsite.com/shop), they may automatically be redirected to a translated " @@ -1921,13 +4100,13 @@ msgid "" "yourwebsite.com/fr\\_FR/shop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:299 +#: ../../content/applications/websites/website/pages/seo.rst:302 msgid "" "Next time, it keeps a cookie of the current language to avoid any " "redirection." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:302 +#: ../../content/applications/websites/website/pages/seo.rst:305 msgid "" "To force a visitor to stick to the default language, you can use the code of" " the default language in your link, example: yourwebsite.com/en\\_US/shop. " @@ -1935,15 +4114,15 @@ msgid "" "using the browser language preferences." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:309 +#: ../../content/applications/websites/website/pages/seo.rst:312 msgid "Page Speed" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:312 +#: ../../content/applications/websites/website/pages/seo.rst:315 msgid "Introduction" msgstr "介紹" -#: ../../content/applications/websites/website/optimize/seo.rst:314 +#: ../../content/applications/websites/website/pages/seo.rst:317 msgid "" "The time to load a page is an important criteria for search engines. A " "faster website not only improves your visitor's experience, but gives you a " @@ -1955,42 +4134,42 @@ msgid "" "amazon-16-billion-sales>`__." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:325 +#: ../../content/applications/websites/website/pages/seo.rst:328 msgid "" "Fortunately, Odoo does all the magic for you. Below, you will find the " "tricks Odoo uses to speed up your page loading time. You can compare how " "your website ranks using these two tools:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:329 +#: ../../content/applications/websites/website/pages/seo.rst:332 msgid "" "`Google Page Speed " "<https://developers.google.com/speed/pagespeed/insights/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:331 +#: ../../content/applications/websites/website/pages/seo.rst:334 msgid "`Pingdom Website Speed Test <http://tools.pingdom.com/fpt/>`__" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:334 +#: ../../content/applications/websites/website/pages/seo.rst:337 msgid "Images" msgstr "圖片" -#: ../../content/applications/websites/website/optimize/seo.rst:336 +#: ../../content/applications/websites/website/pages/seo.rst:339 msgid "" "When you upload new images, Odoo automatically compresses them to reduce " "their sizes (lossless compression for .PNG and .GIF and lossy compression " "for .JPG)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:340 +#: ../../content/applications/websites/website/pages/seo.rst:343 msgid "" "From the upload button, you have the option to keep the original image " "unmodified if you prefer to optimize the quality of the image rather than " "performance." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:348 +#: ../../content/applications/websites/website/pages/seo.rst:351 msgid "" "Odoo compresses images when they are uploaded to your website, not when " "requested by the visitor. Thus, it's possible that, if you use a third-party" @@ -1998,18 +4177,18 @@ msgid "" "images used in Odoo official themes have been compressed by default." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:354 +#: ../../content/applications/websites/website/pages/seo.rst:357 msgid "" "When you click on an image, Odoo shows you the Alt and title attributes of " "the ``<img>`` tag. You can click on it to set your own title and Alt " "attributes for the image." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:361 +#: ../../content/applications/websites/website/pages/seo.rst:364 msgid "When you click on this link, the following window will appear:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:366 +#: ../../content/applications/websites/website/pages/seo.rst:369 msgid "" "Odoo's pictograms are implemented using a font (`Font Awesome " "<https://fortawesome.github.io/Font-Awesome/icons/>`__ in most Odoo themes)." @@ -2017,32 +4196,32 @@ msgid "" "not result in extra requests to load the page." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:375 +#: ../../content/applications/websites/website/pages/seo.rst:378 msgid "Static Resources: CSS" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:377 +#: ../../content/applications/websites/website/pages/seo.rst:380 msgid "" "All CSS files are pre-processed, concatenated, minified, compressed and " "cached (server-side and browser-side). The result:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:380 +#: ../../content/applications/websites/website/pages/seo.rst:383 msgid "only one CSS file request is needed to load a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:382 +#: ../../content/applications/websites/website/pages/seo.rst:385 msgid "" "this CSS file is shared and cached amongst pages, so that when the visitor " "clicks on another page, the browser doesn't have to even load a single CSS " "resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:386 +#: ../../content/applications/websites/website/pages/seo.rst:389 msgid "this CSS file is optimized to be small" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:388 +#: ../../content/applications/websites/website/pages/seo.rst:391 msgid "" "**Pre-processed:** The CSS framework used by Odoo is Bootstrap. Although a " "theme might use another framework, most of `Odoo themes " @@ -2052,7 +4231,7 @@ msgid "" "file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:395 +#: ../../content/applications/websites/website/pages/seo.rst:398 msgid "" "**Concatenated:** every module or library you might use in Odoo has its own " "set of CSS, Less or Sass files (eCommerce, blogs, themes, etc.). Having " @@ -2064,7 +4243,7 @@ msgid "" "on the number of requests to be done than the actual file size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:405 +#: ../../content/applications/websites/website/pages/seo.rst:408 msgid "" "To address this issue, all CSS / Less / Sass files are concatenated into a " "single .CSS file to send to the browser. So a visitor has **only one .CSS " @@ -2073,55 +4252,55 @@ msgid "" "browser does not even have to load a new CSS file!" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**Both files in the <head>**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:412 +#: ../../content/applications/websites/website/pages/seo.rst:415 msgid "**What the visitor gets (only one file)**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 +#: ../../content/applications/websites/website/pages/seo.rst:417 msgid "/\\* From bootstrap.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:414 -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:421 -#: ../../content/applications/websites/website/optimize/seo.rst:447 +#: ../../content/applications/websites/website/pages/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:424 +#: ../../content/applications/websites/website/pages/seo.rst:450 msgid ".text-muted {" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:415 -#: ../../content/applications/websites/website/optimize/seo.rst:422 -#: ../../content/applications/websites/website/optimize/seo.rst:448 +#: ../../content/applications/websites/website/pages/seo.rst:418 +#: ../../content/applications/websites/website/pages/seo.rst:425 +#: ../../content/applications/websites/website/pages/seo.rst:451 msgid "color: #666;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "color: #777;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:416 +#: ../../content/applications/websites/website/pages/seo.rst:419 msgid "background: yellow" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 +#: ../../content/applications/websites/website/pages/seo.rst:420 msgid "background: yellow;" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:417 -#: ../../content/applications/websites/website/optimize/seo.rst:418 -#: ../../content/applications/websites/website/optimize/seo.rst:423 -#: ../../content/applications/websites/website/optimize/seo.rst:449 +#: ../../content/applications/websites/website/pages/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:421 +#: ../../content/applications/websites/website/pages/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:452 msgid "}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:420 +#: ../../content/applications/websites/website/pages/seo.rst:423 msgid "/\\* From my-theme.css \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:426 +#: ../../content/applications/websites/website/pages/seo.rst:429 msgid "" "The CSS sent by Odoo includes all CSS / Less / Sass of all pages / modules. " "By doing this, additional page views from the same visitor will not have to " @@ -2133,79 +4312,79 @@ msgid "" " backend (/web)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:436 +#: ../../content/applications/websites/website/pages/seo.rst:439 msgid "" "If the CSS file is very big, Odoo will split it into two smaller files to " "avoid the 4095 selectors limit per sheet of Internet Explorer. But most " "themes fit below this limit." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:440 +#: ../../content/applications/websites/website/pages/seo.rst:443 msgid "" "**Minified:** After being pre-processed and concatenated, the resulting CSS " "is minified to reduce its size." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**Before minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:444 +#: ../../content/applications/websites/website/pages/seo.rst:447 msgid "**After minification**" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid "/\\* some comments \\*/" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:446 +#: ../../content/applications/websites/website/pages/seo.rst:449 msgid ".text-muted {color: #666}" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:452 +#: ../../content/applications/websites/website/pages/seo.rst:455 msgid "" "The final result is then compressed, before being delivered to the browser." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:455 +#: ../../content/applications/websites/website/pages/seo.rst:458 msgid "" "Then, a cached version is stored server-side (so we do not have to pre-" "process, concatenate, minify at every request) and browser-side (so the same" " visitor will load the CSS only once for all pages they visit)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:461 +#: ../../content/applications/websites/website/pages/seo.rst:464 msgid "Static Resources: Javascript" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:463 +#: ../../content/applications/websites/website/pages/seo.rst:466 msgid "" "As with CSS resources, Javascript resources are also concatenated, minified," " compressed and cached (server-side and browser-side)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:466 +#: ../../content/applications/websites/website/pages/seo.rst:469 msgid "Odoo creates three Javascript bundles:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:468 +#: ../../content/applications/websites/website/pages/seo.rst:471 msgid "" "One for all pages of the website (including code for parallax effects, form " "validation, etc.)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:471 +#: ../../content/applications/websites/website/pages/seo.rst:474 msgid "" "One for common Javascript code shared among frontend and backend (Bootstrap)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:474 +#: ../../content/applications/websites/website/pages/seo.rst:477 msgid "" "One for backend specific Javascript code (Odoo Web Client interface for your" " employees using Odoo)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:477 +#: ../../content/applications/websites/website/pages/seo.rst:480 msgid "" "Most visitors of your website will only need the first two bundles, " "resulting in a maximum of two Javascript files to load to render one page. " @@ -2213,7 +4392,7 @@ msgid "" "visitor will not load any other Javascript resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:483 +#: ../../content/applications/websites/website/pages/seo.rst:486 msgid "" "If you work on :ref:`developer mode <developer-mode>`, the CSS and " "Javascript are neither concatenated, nor minified. Thus, it's much slower. " @@ -2221,102 +4400,102 @@ msgid "" "Javascript resources are not transformed from their original versions." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:488 +#: ../../content/applications/websites/website/pages/seo.rst:491 msgid "CDN" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:490 +#: ../../content/applications/websites/website/pages/seo.rst:493 msgid "" "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, " "images) are loaded from a Content Delivery Network. Using a Content Delivery" " Network has three advantages:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:494 +#: ../../content/applications/websites/website/pages/seo.rst:497 msgid "" "Load resources from a nearby server (most CDN have servers in main countries" " around the globe)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:497 +#: ../../content/applications/websites/website/pages/seo.rst:500 msgid "" "Cache resources efficiently (no computation resources usage on your own " "server)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:500 +#: ../../content/applications/websites/website/pages/seo.rst:503 msgid "" "Split the resource loading on different services allowing to load more " "resources in parallel (since the Chrome limit of 6 parallel requests is by " "domain)" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:504 +#: ../../content/applications/websites/website/pages/seo.rst:507 msgid "" "You can configure your CDN options from the **Website Admin** app, using the" " Configuration menu. Here is an example of configuration you can use:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:511 +#: ../../content/applications/websites/website/pages/seo.rst:514 msgid "HTML Pages" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:513 +#: ../../content/applications/websites/website/pages/seo.rst:516 msgid "" "The HTML pages can be compressed, but this is usually handled by your web " "server (NGINX or Apache)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:516 +#: ../../content/applications/websites/website/pages/seo.rst:519 msgid "" "The Odoo Website builder has been optimized to guarantee clean and short " "HTML code. Building blocks have been developed to produce clean HTML code, " "usually using Bootstrap and the HTML editor." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:520 +#: ../../content/applications/websites/website/pages/seo.rst:523 msgid "" "As an example, if you use the color picker to change the color of a " "paragraph to the primary color of your website, Odoo will produce the " "following code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:524 +#: ../../content/applications/websites/website/pages/seo.rst:527 msgid "``<p class=\"text-primary\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:526 +#: ../../content/applications/websites/website/pages/seo.rst:529 msgid "" "Whereas most HTML editors (such as CKEditor) will produce the following " "code:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:529 +#: ../../content/applications/websites/website/pages/seo.rst:532 msgid "``<p style=\"color: #AB0201\">My Text</p>``" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:532 +#: ../../content/applications/websites/website/pages/seo.rst:535 msgid "Responsive Design" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:534 +#: ../../content/applications/websites/website/pages/seo.rst:537 msgid "" "Websites that are not mobile-friendly are negatively impacted in search " "engine rankings. All Odoo themes rely on Bootstrap to render efficiently " "according to the device: desktop, tablet or mobile." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:541 +#: ../../content/applications/websites/website/pages/seo.rst:544 msgid "" "As all Odoo modules share the same technology, absolutely all pages in your " "website are mobile friendly." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:545 +#: ../../content/applications/websites/website/pages/seo.rst:548 msgid "Browser Caching" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:547 +#: ../../content/applications/websites/website/pages/seo.rst:550 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 " @@ -2326,44 +4505,44 @@ msgid "" "your website." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:554 +#: ../../content/applications/websites/website/pages/seo.rst:557 msgid "" "This allows Odoo to set a very long cache delay (XXX) on these resources: " "XXX secs, while being updated instantly if you update the resource." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:559 +#: ../../content/applications/websites/website/pages/seo.rst:562 msgid "Scalability" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:561 +#: ../../content/applications/websites/website/pages/seo.rst:564 msgid "" "In addition to being fast, Odoo is also more scalable than traditional CMS " "and eCommerce (Drupal, Wordpress, Magento, Prestashop)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:564 +#: ../../content/applications/websites/website/pages/seo.rst:567 msgid "" "Here is the slide that summarizes the scalability of Odoo Website & " "eCommerce." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:570 +#: ../../content/applications/websites/website/pages/seo.rst:573 msgid "Search Engines Files" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:573 +#: ../../content/applications/websites/website/pages/seo.rst:576 msgid "Sitemap" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:575 +#: ../../content/applications/websites/website/pages/seo.rst:578 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:579 +#: ../../content/applications/websites/website/pages/seo.rst:582 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, " @@ -2372,22 +4551,22 @@ msgid "" "chunks per file." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:585 +#: ../../content/applications/websites/website/pages/seo.rst:588 msgid "Every sitemap entry has 4 attributes that are computed automatically:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:587 +#: ../../content/applications/websites/website/pages/seo.rst:590 msgid "``<loc>`` : the URL of a page" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:589 +#: ../../content/applications/websites/website/pages/seo.rst:592 msgid "" "``<lastmod>`` : 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:594 +#: ../../content/applications/websites/website/pages/seo.rst:597 msgid "" "``<priority>`` : modules may implement their own priority algorithm based on" " their content (example: a forum might assign a priority based on the number" @@ -2395,11 +4574,11 @@ msgid "" "it's priority field, which is normalized (16 is the default)." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:601 +#: ../../content/applications/websites/website/pages/seo.rst:604 msgid "Structured Data Markup" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:603 +#: ../../content/applications/websites/website/pages/seo.rst:606 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 " @@ -2407,13 +4586,13 @@ msgid "" "presented search results." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:608 +#: ../../content/applications/websites/website/pages/seo.rst:611 msgid "" "Google supports a number of rich snippets for content types, including: " "Reviews, People, Products, Businesses, Events and Organizations." msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:611 +#: ../../content/applications/websites/website/pages/seo.rst:614 msgid "" "Odoo implements micro data as defined in the `schema.org " "<http://schema.org>`__ specification for events, eCommerce products, forum " @@ -2421,29 +4600,29 @@ msgid "" "in Google using extra information like the price and rating of a product:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:621 +#: ../../content/applications/websites/website/pages/seo.rst:624 msgid "robots.txt" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:623 +#: ../../content/applications/websites/website/pages/seo.rst:626 msgid "" "When indexing your website, search engines take a first look at the general " "indexing rules of the ``/robots.txt`` file (allowed robots, sitemap path, " "etc.). Odoo automatically creates it. Its content is:" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:627 +#: ../../content/applications/websites/website/pages/seo.rst:630 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml" msgstr "" -#: ../../content/applications/websites/website/optimize/seo.rst:630 +#: ../../content/applications/websites/website/pages/seo.rst:633 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 "" -#: ../../content/applications/websites/website/optimize/seo.rst:634 +#: ../../content/applications/websites/website/pages/seo.rst:637 msgid "" "You can customize the file *robots* in :ref:`developer mode <developer-" "mode>` from *Settings --> Technical --> User Interface --> Views* (exclude " @@ -2452,682 +4631,230 @@ msgid "" "upgrades." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:3 -msgid "Unsplash (free images)" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:3 +msgid "How to track your website's traffic in Google Analytics" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:6 -msgid "Generate an Unsplash access key" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:5 +msgid "To follow your website's traffic with Google Analytics:" msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:9 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:7 msgid "" -"**As an Odoo Online user**, you are ready to use Unsplash. You won't need to" -" follow this guide to set up Unsplash information since you will use our own" -" Odoo Unsplash key in a transparent way." +"`Create a Google Analytics account <https://www.google.com/analytics/>`__ if" +" you don't have any." msgstr "" -#: ../../content/applications/websites/website/optimize/unsplash.rst:13 -msgid "Generate an Unsplash access key for non-Odoo Online users" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:15 -msgid "Create an account on `Unsplash.com <https://unsplash.com/join>`_." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:17 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on **New " -"Application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:23 -msgid "Accept the conditions and click on **Accept terms**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:28 -msgid "" -"You will be prompted to insert an **Application name** and a " -"**Description**. Please prefix your application name by \"**Odoo:** \" so " -"that Unsplash can recognize it as an Odoo instance. Once done, click on " -"**Create application**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:35 -msgid "" -"You should be redirected to your application details page. Scroll down a bit" -" to find your **access key**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:42 -msgid "" -"**As a non-Odoo Online user**, you won't be able to register for a " -"production Unsplash key and will be limited to your test key that has a " -"restriction of 50 Unsplash requests per hour." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:46 -msgid "Generate an Unsplash application ID" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:49 -msgid "You should first create and set up your Unsplash application." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:51 -msgid "" -"Go to your `applications dashboard " -"<https://unsplash.com/oauth/applications>`_ and click on your newly created " -"Unsplash application under **Your applications**." -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:57 -msgid "" -"You will be redirected to your application details page. The **application " -"ID** will be visible in your browser's URL. The URL should be something like" -" ``https://unsplash.com/oauth/applications/<application_id>``" -msgstr "" - -#: ../../content/applications/websites/website/optimize/unsplash.rst:65 -msgid "" -"**As a non-Odoo Online user**, you won't be able to register for a " -"production Unsplash key and will be limited to your test key that has a 50 " -"Unsplash requests per hour restriction." -msgstr "" - -#: ../../content/applications/websites/website/publish.rst:5 -msgid "Publish" -msgstr "公開" - -#: ../../content/applications/websites/website/publish/multi_website.rst:3 -msgid "Manage Multi Websites" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:8 -msgid "" -"Odoo’s Multi-Websites opens up broad possibilities of diversification and " -"customer segmentation for your business. A multiplied audience and boosted " -"revenue are now just a few clicks away!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:12 -msgid "" -"Each website can work in a fully independent way, with its theme, branding, " -"domain name, header & footer, pages, languages, products, blog posts, forum," -" slides, events, live chat channels, etc. Let’s go for a tour!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:20 -msgid "" -"To create a new website, go to :menuselection:`Website --> Configuration -->" -" Settings`. The button, *Create a new website*, lays in the first section." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:28 -msgid "" -"In the upcoming prompt, set a name for your new website and a specific " -"domain name. Leave empty to publish the new website under the default domain" -" of your Odoo database. You can later set some country groups to redirect " -"visitors to it using Geo IP." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:36 -msgid "" -"Then, select a theme. This new website might have an entirely different " -"purpose or audience than the first one. So feel free to go for a different " -"theme!" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:40 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:10 msgid "" -"Once the theme is selected, you can start to build the homepage of your " -"website. Follow the purple drops; they will help you in the first steps." +"Go through the creation form and accept the conditions to get the tracking " +"ID." msgstr "" -#: ../../content/applications/websites/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. See :ref:`domain-" -"name/existing`." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:52 -msgid "Create the menu" +#: ../../content/applications/websites/website/reporting/google_analytics.rst:15 +msgid "Copy the tracking ID to insert it in Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:54 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:20 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." +"Go to the *Configuration* menu of your Odoo's Website app. In the settings, " +"turn on Google Analytics and paste the tracking ID. Then save the page." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:59 -msgid "Switch from one website to another" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:62 +#: ../../content/applications/websites/website/reporting/google_analytics.rst:27 msgid "" -"As easy as ABC! There is a website switcher in the right corner of the edit " -"bar. Switching to another website will connect to the domain of this " -"website. If you use another domain for the website, the user is requested to" -" sign in." +"To make your first steps in Google Analytics, refer to `Google Documentation" +" <https://support.google.com/analytics/answer/1008015?hl=en/>`_." msgstr "" -#: ../../content/applications/websites/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 prompted to create a new page from there." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:3 +msgid "Link trackers" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:76 -msgid "Add features" -msgstr "增加功能" - -#: ../../content/applications/websites/website/publish/multi_website.rst:78 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:5 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." +"Link Trackers allow you to track your marketing campaigns (emails, banner " +"ads, blog posts, social media posts, affiliate links, etc.). This way, you " +"are able to identify your best traffic sources and make informed decisions " +"about the distribution of your marketing budget." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:82 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:12 msgid "" -"Each website comes with a high range of specific options in the settings. " -"First, select the website to configure." +"Go to :menuselection:`Website --> Configuration --> Settings` and activate " +"*Link Trackers*." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:88 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:94 -msgid "You can, for instance, set specific :" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:96 -msgid "languages," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:98 -msgid "domain names," +"View of Website settings page emphasizing the link trackers field in Odoo " +"Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:100 -msgid "social media links," +#: ../../content/applications/websites/website/reporting/link_tracker.rst:19 +msgid "Set up traceable URLs" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:102 -msgid "customer portal mode (B2C vs. B2B)," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:104 -msgid "dedicated live chat channels," -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:106 -msgid "etc." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:108 -msgid "The other options are global and apply to all your websites." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:111 -msgid "Manage domain names" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:113 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:21 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." +"Go to :menuselection:`Website --> Go to website --> Promote --> Track this " +"page`. Here, you are able to get a specific tracked URL based on the " +"campaign, medium, and source being used." msgstr "" -#: ../../content/applications/websites/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. See :doc:`on-premise_geo-ip-" -"installation`" +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 +msgid "View of the link tracker fields for Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:127 -msgid ":doc:`/administration/maintain/domain_names`" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:129 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:28 msgid "" -"If you setup an extra website and specify the domain name you will have to " -"do three things to get this feature to work:" +"**URL**: url of the page you want to track (e.g. the home page or a " +"product's page)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:132 -msgid "" -"Setup an A-record in the DNS configuration of your hosting provider so that " -"\"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:29 +msgid "**Campaign**: context of your link (e.g. a special promotion)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:134 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:30 msgid "" -"Create an extra Nginx ``server`` block in which you set the ``server_name`` " -"that you've set in the :guilabel:`Website domain` field." +"**Medium**: channel used to share (deliver) your link (e.g. an email or a " +"Facebook ad)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:136 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:31 msgid "" -"Reload and restart your Nginx instance to use the new ``server`` block." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:139 -msgid "Customize the visitor experience" +"**Source**: platform where the traffic originates (e.g. Google or Twitter)." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:142 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:33 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:152 -msgid "Publish specific content per website" +"Now, click on *Get tracked link* to generate a URL that you can post or send" +" by the source you have decided on." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:155 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:37 +msgid "Follow-up on tracked links" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:163 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:39 msgid "" -"Here are all the objects that you can link to *either one or all the " -"websites*:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:166 -msgid "Products" -msgstr "產品" - -#: ../../content/applications/websites/website/publish/multi_website.rst:168 -msgid "Product Categories for eCommerce" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:170 -msgid "Blogs" -msgstr "部落格" - -#: ../../content/applications/websites/website/publish/multi_website.rst:172 -msgid "Slide Channels" +"To look at statistics of your links, go to :menuselection:`Website --> Go to" +" website --> Promote --> Track this page`. Besides being able to see the " +"*Most Clicked* and *Recently Used* links, you can also see complete " +"statistics by clicking on *Stats*, including the number of clicks, and the " +"country of origin for those clicks." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:174 -msgid "Forums" -msgstr "論壇" - -#: ../../content/applications/websites/website/publish/multi_website.rst:176 -msgid "Events" -msgstr "活動" - -#: ../../content/applications/websites/website/publish/multi_website.rst:178 -msgid "Job Positions" -msgstr "職務管理" - -#: ../../content/applications/websites/website/publish/multi_website.rst:181 +#: ../../content/applications/websites/website/reporting/link_tracker.rst-1 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:185 -msgid "Publish a page in all websites" +"View of the tracked list emphasizing the statistics buttons in Odoo Website" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:187 -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." +#: ../../content/applications/websites/website/reporting/link_tracker.rst:50 +msgid "You can also access the link tracker on *odoo.com/r* via your browser." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:191 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:51 msgid "" -"If you want to duplicate it in just one other website, duplicate the page " -"and set the new website." +"Activate the developer mode (:menuselection:`Settings --> Activate the " +"developer mode`) and get access to the *Link Tracker* module and its back-" +"end functionalities." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:197 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:53 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." +"Integrated with :doc:`Google Analytics <google_analytics>`, those trackers " +"allow you to see the number of clicks and visitors to keep you on top of " +"your marketing campaigns." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:202 +#: ../../content/applications/websites/website/reporting/link_tracker.rst:55 msgid "" -"By grouping pages by URL in the page manager, you quickly find the original " -"page behind each edited page." +"The integration with the :doc:`CRM " +"</applications/sales/crm/track_leads/prospect_visits>` application allows " +"you to understand where your leads and opportunities are coming from." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:209 -msgid "Multi-companies" +#: ../../content/applications/websites/website/reporting/plausible.rst:3 +msgid "Website analytics with Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:211 -msgid "" -"Each website can be linked to a specific company of your system, in a multi-" -"companies environment." +#: ../../content/applications/websites/website/reporting/plausible.rst:5 +msgid "To follow your website's traffic with Plausible.io:" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:217 +#: ../../content/applications/websites/website/reporting/plausible.rst:7 msgid "" -"With such a configuration, only company-related data appear on the website " -"(products, jobs, events, etc.)." +"`Create a Plausible.io account <https://plausible.io/register>`_ if you " +"don't have any." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:220 +#: ../../content/applications/websites/website/reporting/plausible.rst:8 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." +"`Create your website <https://plausible.io/sites/new>`_ and `Start " +"collecting data` if it is not already done." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:226 +#: ../../content/applications/websites/website/reporting/plausible.rst:10 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." +"Go through the `list of your websites <https://plausible.io/sites>`_ and " +"click on the gear icon." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:232 -msgid "Configure your eCommerce website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Click on cog icon in the list of websites" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:234 +#: ../../content/applications/websites/website/reporting/plausible.rst:16 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." +"Click on the button :guilabel:`+ New Link` in the tab Visibility to create " +"your Shared links." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:239 -msgid "Products only available on one website" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Adding a shared link in the Visibility tab" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:241 +#: ../../content/applications/websites/website/reporting/plausible.rst:22 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." +"Choose a name (and NO password - it is not supported to embed it in Odoo) " +"and click on the button `Create Shared Link`." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:249 -msgid "Products available on *some* websites" +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Credentials creation for the new shared link" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:251 +#: ../../content/applications/websites/website/reporting/plausible.rst:29 msgid "" -"To make a product available on some websites, but not all of them, you " -"should duplicate the product for each website." +"Copy the new Shared Link URL from Plausible.io and paste it into the " +"Settings of Odoo." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:254 -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." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Copy the shared link URL from Plausible.io" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:261 -msgid "Pricelists" -msgstr "價格表" - -#: ../../content/applications/websites/website/publish/multi_website.rst:263 -msgid "" -"To manage specific prices by websites, you can activate *Multiple Sales " -"Prices per Product* in Website settings." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "Paste the shared link URL to Odoo settings" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:266 -msgid "" -"Then, go to :menuselection:`Website --> Products --> Pricelists` to create " -"additional pricelists. See " -":doc:`../../ecommerce/maximizing_revenue/pricing`." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**You are on the Odoo Online Platform**" msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:269 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"If you need help. Select a website to make a pricelist only available on " -"this website." +"When you `create your Odoo Online database <https://www.odoo.com/trial>`_, " +"we create it for you on our own server. You don't have anything to do." msgstr "" -#: ../../content/applications/websites/website/publish/multi_website.rst:275 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:280 -msgid "Payment Providers and Delivery Methods" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:282 -msgid "" -"By default, published payment providers and delivery methods are deployed in" -" all websites. You could already use specific payment providers 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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:288 -msgid "Customer accounts" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:290 -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 "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:300 -msgid "Technical hints for customization" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:302 -msgid "" -"If you want to publish custom objects on the website, here are a few tips to" -" make it work with multi websites:" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "Sitemap: don’t forget the domain in the route to only publish" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:306 -msgid "available records in each website’s sitemap." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:310 -msgid "Access: you should call the method" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:309 -msgid "" -"*can_access_from_current_website* in the controller to make sure the visitor" -" can see a record in the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:314 -msgid "Search: when a list of records is displayed, don’t forget to specify" -msgstr "" - -#: ../../content/applications/websites/website/publish/multi_website.rst:313 -msgid "the domain to only display records available for the current website." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:3 -msgid "Geo IP Installation (On-Premises Database)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:6 -msgid "Installation" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:9 -msgid "" -"Please note that the installation depends on your computer's operating " -"system and distribution. We will assume that a Linux operating system is " -"being used." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:15 -msgid "Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:17 -msgid "" -"Download the `GeoLite2 City database " -"<https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with a" -" file called ``GeoLite2-City.mmdb``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:22 -msgid "Move the file to the folder ``/usr/share/GeoIP/``" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:24 -msgid "Restart the server" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:27 -msgid "" -"If you can't/don't want to locate the geoip database in " -"``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo " -"command line interface. This option takes the absolute path to the GeoIP " -"database file and uses it as the GeoIP database. For example:" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36 -msgid ":doc:`CLI documentation </developer/cli>`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39 -msgid "" -"``GeoIP`` Python library can also be used. However this version is " -"discontinued since January 1. See `GeoLite Legacy databases are now " -"discontinued <https://support.maxmind.com/geolite-legacy-discontinuation-" -"notice/>`_" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:44 -msgid "How To Test GeoIP Geolocation In Your Odoo Website" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:45 -msgid "Go to your website. Open the web page that you want to test ``GeoIP``." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:46 -msgid "Choose :menuselection:`Customize --> HTML/CSS/JS Editor`." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:47 -msgid "Add the following piece of XML in the page :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:53 -msgid "" -"You should end up with a dictionary indicating the location of the IP " -"address." -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:59 -msgid "" -"If the curly braces are empty ``{}``, it can be for any of the following " -"reasons :" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:61 -msgid "" -"The browsing IP address is the localhost (``127.0.0.1``) or a local area " -"network one (``192.168.*.*``)" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:62 -msgid "" -"If a reversed proxy is used, make sure to configure it correctly. See " -":option:`proxy mode <odoo-bin --proxy-mode>`" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:63 -msgid "``geoip2`` is not installed or the GeoIP database file wasn't found" -msgstr "" - -#: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:64 -msgid "The GeoIP database was unable to resolve the given IP address" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:3 -msgid "How to translate my website" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:8 -msgid "" -"In addition to creating great modern websites, Odoo gives you the " -"possibility to translate it in different languages." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:12 -msgid "Process" -msgstr "處理" - -#: ../../content/applications/websites/website/publish/translate.rst:14 -msgid "" -"Once your website is created, you have the opportunity to translate it in as" -" many different languages as you want." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:17 -msgid "You can only translate your website manually, follow the next step." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:19 -msgid "" -"Now go to your website. On the bottom right corner of the page, click on " -"**Add a language**." -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:25 -msgid "" -"Choose the language in which you want to translate your website and then " -"click on **Load.**" -msgstr "" - -#: ../../content/applications/websites/website/publish/translate.rst:31 -msgid "" -"You will see that Now, next to English there is also French, which means " -"that the page for the translation has been created. You can also see that " -"some of the text has been translated automatically." +#: ../../content/applications/websites/website/reporting/plausible.rst:0 +msgid "**What about the Goal?**" msgstr "" -#: ../../content/applications/websites/website/publish/translate.rst:38 +#: ../../content/applications/websites/website/reporting/plausible.rst:0 msgid "" -"To translate the content of the website, click on **Translate** (here " -"**Traduire** since we want to translate the website in French)." +"Odoo pushes out-of-the-box custom events: `Lead Generation` and `Shop`." msgstr ""