Skip to content

Commit

Permalink
Merge branch '12.0' into 12.0-add-rental_timeline-cpatel
Browse files Browse the repository at this point in the history
  • Loading branch information
chandni299 authored Jan 29, 2024
2 parents 07a27ab + 05ea294 commit 1e65df8
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 20 deletions.
57 changes: 42 additions & 15 deletions rental_base/i18n/pt_BR.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * rental_base
# * rental_base
#
msgid ""
msgstr ""
Expand All @@ -19,11 +19,14 @@ msgstr ""
#. module: rental_base
#: code:addons/rental_base/models/sale.py:343
#, fuzzy, python-format
msgid "\n"
msgid ""
"\n"
"Order: %s\n"
"Line with product: '%s'\n"
"\n"
"Please use instead the button 'Update Times' in the order to correctly update the order line's times, its timeline entry, contract and its stock moves and pickings as required."
"Please use instead the button 'Update Times' in the order to correctly "
"update the order line's times, its timeline entry, contract and its stock "
"moves and pickings as required."
msgstr ""
"\n"
"Pedido: %s\n"
Expand Down Expand Up @@ -69,7 +72,10 @@ msgstr "Atributos"

#. module: rental_base
#: model_terms:ir.ui.view,arch_db:rental_base.update_sale_line_date_form
msgid "By changing the start and end dates of order lines, the dates are also updated in the timeline,the related stock pickings and contracts, if available.\n"
msgid ""
"By changing the start and end dates of order lines, the dates are also "
"updated in the timeline,the related stock pickings and contracts, if "
"available.\n"
" Attention: The ordered quantities are not updated!"
msgstr ""

Expand Down Expand Up @@ -234,12 +240,16 @@ msgstr ""

#. module: rental_base
#: model:ir.model.fields,help:rental_base.field_update_sale_line_date__from_line
msgid "In order to update one or several order lines, please set a number referring to the first order line that should to be changed."
msgid ""
"In order to update one or several order lines, please set a number referring "
"to the first order line that should to be changed."
msgstr ""

#. module: rental_base
#: model:ir.model.fields,help:rental_base.field_update_sale_line_date__to_line
msgid "In order to update one or several order lines, please set a number referring to the last order line that should to be changed."
msgid ""
"In order to update one or several order lines, please set a number referring "
"to the last order line that should to be changed."
msgstr ""

#. module: rental_base
Expand All @@ -252,7 +262,8 @@ msgstr ""
#. module: rental_base
#: code:addons/rental_base/models/sale.py:284
#, python-format
msgid "Incoming shipment is in state %s. You cannot change the end date anymore."
msgid ""
"Incoming shipment is in state %s. You cannot change the end date anymore."
msgstr ""

#. module: rental_base
Expand Down Expand Up @@ -297,7 +308,8 @@ msgstr ""
#. module: rental_base
#: code:addons/rental_base/models/sale.py:130
#, python-format
msgid "Missing \"Rental to Extend\" on the sale order line with rental service %s."
msgid ""
"Missing \"Rental to Extend\" on the sale order line with rental service %s."
msgstr ""

#. module: rental_base
Expand All @@ -318,25 +330,35 @@ msgstr "Pedido Normal"
#. module: rental_base
#: code:addons/rental_base/models/sale.py:154
#, python-format
msgid "On the \"new rental\" sale order line with product \"%s\", we should have a rental service product!"
msgid ""
"On the \"new rental\" sale order line with product \"%s\", we should have a "
"rental service product!"
msgstr ""

#. module: rental_base
#: code:addons/rental_base/models/sale.py:163
#, python-format
msgid "On the sale order line with product %s you are trying to sell a rented product with a quantity (%s) that is different from the rented quantity (%s). This is not supported."
msgid ""
"On the sale order line with product %s you are trying to sell a rented "
"product with a quantity (%s) that is different from the rented quantity "
"(%s). This is not supported."
msgstr ""

#. module: rental_base
#: code:addons/rental_base/models/sale.py:139
#, python-format
msgid "On the sale order line with rental service %s, you are trying to extend a rental with a rental quantity (%s) that is different from the quantity of the original rental (%s). This is not supported."
msgid ""
"On the sale order line with rental service %s, you are trying to extend a "
"rental with a rental quantity (%s) that is different from the quantity of "
"the original rental (%s). This is not supported."
msgstr ""

#. module: rental_base
#: model_terms:ir.actions.act_window,help:rental_base.action_rental_orders
#: model_terms:ir.actions.act_window,help:rental_base.action_rental_quotations
msgid "Once the quotation is confirmed, it becomes a sales order.<br> You will be able to create an invoice and collect the payment."
msgid ""
"Once the quotation is confirmed, it becomes a sales order.<br> You will be "
"able to create an invoice and collect the payment."
msgstr ""

#. module: rental_base
Expand Down Expand Up @@ -380,7 +402,8 @@ msgstr "Entregas de Saída"
#. module: rental_base
#: code:addons/rental_base/models/sale.py:267
#, python-format
msgid "Outgoing shipment is in state %s. You cannot change the start date anymore."
msgid ""
"Outgoing shipment is in state %s. You cannot change the start date anymore."
msgstr ""

#. module: rental_base
Expand Down Expand Up @@ -571,13 +594,17 @@ msgstr "Assistente para atualizar datas das linhas do pedido de vendas"
#. module: rental_base
#: code:addons/rental_base/models/sale.py:336
#, python-format
msgid "You are not allowed to change the 'end date' in an order line of a confirmed order."
msgid ""
"You are not allowed to change the 'end date' in an order line of a confirmed "
"order."
msgstr ""

#. module: rental_base
#: code:addons/rental_base/models/sale.py:319
#, python-format
msgid "You are not allowed to change the 'start date' in an order line of a confirmed order."
msgid ""
"You are not allowed to change the 'start date' in an order line of a "
"confirmed order."
msgstr ""

#. module: rental_base
Expand Down
10 changes: 7 additions & 3 deletions rental_check_availability/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ msgstr ""
"PO-Revision-Date: 2021-10-18 14:06+0200\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"
"Language: de\n"
"X-Generator: Poedit 3.0\n"

#. module: rental_check_availability
Expand Down Expand Up @@ -72,5 +72,9 @@ msgstr "Zeitgleiche Aufträge anzeigen."
#. module: rental_check_availability
#: code:addons/rental_check_availability/models/sale.py:49
#, python-format
msgid "You want to rent %.2f %s but you only have %.2f %s available in the selected period."
msgstr "Sie versuchen %.2f %s Einheiten zu vermieten, es sind aber nur %.2f %s Einheiten im aktuellen Bestand verfügbar."
msgid ""
"You want to rent %.2f %s but you only have %.2f %s available in the selected "
"period."
msgstr ""
"Sie versuchen %.2f %s Einheiten zu vermieten, es sind aber nur %.2f %s "
"Einheiten im aktuellen Bestand verfügbar."
26 changes: 24 additions & 2 deletions rental_product_pack/i18n/de.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * rental_product_pack
# * rental_product_pack
#
msgid ""
msgstr ""
Expand All @@ -10,11 +10,34 @@ msgstr ""
"PO-Revision-Date: 2020-02-11 12:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: rental_product_pack
#: model:ir.model.fields,field_description:rental_product_pack.field_product_product__used_pack_line_count
#: model:ir.model.fields,field_description:rental_product_pack.field_product_template__used_pack_line_count
msgid "# Used Pack Line Count"
msgstr ""

#. module: rental_product_pack
#: model_terms:ir.ui.view,arch_db:rental_product_pack.product_template_only_form_view
#: model_terms:ir.ui.view,arch_db:rental_product_pack.rental_product_pack_form
msgid "Found in packs"
msgstr ""

#. module: rental_product_pack
#: model:ir.model,name:rental_product_pack.model_product_product
msgid "Product"
msgstr ""

#. module: rental_product_pack
#: model:ir.model,name:rental_product_pack.model_product_template
msgid "Product Template"
msgstr ""

#. module: rental_product_pack
#: model:ir.model.fields,field_description:rental_product_pack.field_stock_move__rental_pack_move_id
msgid "Rental Main Pack Move"
Expand All @@ -29,4 +52,3 @@ msgstr "Verkaufsauftrag"
#: model:ir.model,name:rental_product_pack.model_stock_move
msgid "Stock Move"
msgstr "Lagerbewegung"

0 comments on commit 1e65df8

Please sign in to comment.