diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index afa549260e1..3b9aa135e12 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -944,13 +944,6 @@ msgstr ""
 msgid "All at once"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"All our contractual relations will be governed exclusively by United States "
-"law."
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move__returned_move_ids
 msgid "All returned moves"
@@ -1335,13 +1328,6 @@ msgstr ""
 msgid "Before scheduled date"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"Below text serves as a suggestion and doesn’t engage Odoo S.A. "
-"responsibility."
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields.selection,name:stock.selection__res_partner__picking_warn__block
 msgid "Blocking Message"
@@ -1478,18 +1464,6 @@ msgstr ""
 msgid "Category Routes"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"Certain countries apply withholding at source on the amount of invoices, in "
-"accordance with their internal legislation. Any withholding at source will "
-"be paid by the client to the tax authorities. Under no circumstances can My "
-"Company (Chicago) become involved in costs related to a country's "
-"legislation. The amount of the invoice will therefore be due to My Company "
-"(Chicago) in its entirety and does not include any costs relating to the "
-"legislation of the country in which the client is located."
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking__move_dest_exists
 msgid "Chained Move Exists"
@@ -3331,6 +3305,13 @@ msgstr ""
 msgid "Generate Serials numbers"
 msgstr ""
 
+#. module: stock
+#. odoo-javascript
+#: code:addons/stock/static/src/widgets/lots_dialog.xml:0
+#, python-format
+msgid "Generate Serials/Lots"
+msgstr ""
+
 #. module: stock
 #: model_terms:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Get a full traceability from vendors to customers"
@@ -3544,15 +3525,6 @@ msgstr ""
 msgid "Icon to indicate an exception activity."
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"If a payment is still outstanding more than sixty (60) days after the due "
-"payment date, My Company (Chicago) reserves the right to call on the "
-"services of a debt recovery company. All legal expenses will be payable by "
-"the client."
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields.selection,name:stock.selection__stock_storage_category__allow_new_product__same
 msgid "If all products are same"
@@ -3769,6 +3741,13 @@ msgstr ""
 msgid "Import Lots"
 msgstr ""
 
+#. module: stock
+#. odoo-javascript
+#: code:addons/stock/static/src/widgets/lots_dialog.xml:0
+#, python-format
+msgid "Import Serials/Lots"
+msgstr ""
+
 #. module: stock
 #. odoo-python
 #: code:addons/stock/models/stock_quant.py:0
@@ -3786,15 +3765,6 @@ msgstr ""
 msgid "In Type"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"In order for it to be admissible, My Company (Chicago) must be notified of "
-"any claim by means of a letter sent by recorded delivery to its registered "
-"office within 8 days of the delivery of the goods or the provision of the "
-"services."
-msgstr ""
-
 #. module: stock
 #. odoo-javascript
 #: code:addons/stock/static/src/stock_forecasted/forecasted_header.xml:0
@@ -4981,17 +4951,6 @@ msgstr ""
 msgid "My Activity Deadline"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"My Company (Chicago) undertakes to do its best to supply performant services"
-" in due time in accordance with the agreed timeframes. However, none of its "
-"obligations can be considered as being an obligation to achieve results. My "
-"Company (Chicago) cannot under any circumstances, be required by the client "
-"to appear as a third party in the context of any claim for damages filed "
-"against the client by an end consumer."
-msgstr ""
-
 #. module: stock
 #: model_terms:ir.ui.view,arch_db:stock.quant_search_view
 msgid "My Counts"
@@ -5076,12 +5035,6 @@ msgstr ""
 msgid "New Transfer"
 msgstr ""
 
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_lot__activity_calendar_event_id
-#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_calendar_event_id
-msgid "Next Activity Calendar Event"
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_lot__activity_date_deadline
 #: model:ir.model.fields,field_description:stock.field_stock_picking__activity_date_deadline
@@ -5599,17 +5552,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"Our invoices are payable within 21 working days, unless another payment "
-"timeframe is indicated on either the invoice or the order. In the event of "
-"non-payment by the due date, My Company (Chicago) reserves the right to "
-"request a fixed interest payment amounting to 10% of the sum remaining due. "
-"My Company (Chicago) will be authorized to suspend any provision of services"
-" without prior warning in the event of late payment."
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse__out_type_id
 msgid "Out Type"
@@ -6827,13 +6769,6 @@ msgstr ""
 msgid "RETURN OF"
 msgstr ""
 
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_lot__rating_ids
-#: model:ir.model.fields,field_description:stock.field_stock_picking__rating_ids
-#: model:ir.model.fields,field_description:stock.field_stock_scrap__rating_ids
-msgid "Ratings"
-msgstr ""
-
 #. module: stock
 #: model:ir.model.fields.selection,name:stock.selection__stock_picking__state__assigned
 #: model_terms:ir.ui.view,arch_db:stock.stock_picking_type_kanban
@@ -7497,11 +7432,6 @@ msgstr ""
 msgid "SSCC:"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid "STANDARD TERMS AND CONDITIONS OF SALE"
-msgstr ""
-
 #. module: stock
 #. odoo-javascript
 #: code:addons/stock/static/src/widgets/json_widget.xml:0
@@ -8475,15 +8405,6 @@ msgstr ""
 msgid "The barcode for a location must be unique per company!"
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid ""
-"The client explicitly waives its own standard terms and conditions, even if "
-"these were drawn up after these standard terms and conditions of sale. In "
-"order to be valid, any derogation must be expressly agreed to in advance in "
-"writing."
-msgstr ""
-
 #. module: stock
 #. odoo-python
 #: code:addons/stock/models/stock_lot.py:0
@@ -10399,11 +10320,6 @@ msgstr ""
 msgid "You need to supply a Lot/Serial number for products %s."
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,invoice_terms_html:stock.res_company_1
-msgid "You should update this document to reflect your T&C."
-msgstr ""
-
 #. module: stock
 #. odoo-python
 #: code:addons/stock/models/stock_warehouse.py:0
@@ -10437,13 +10353,6 @@ msgid ""
 "            To save time in the future, set the rules as \"automated\"."
 msgstr ""
 
-#. module: stock
-#: model_terms:res.company,lunch_notify_message:stock.res_company_1
-msgid ""
-"Your lunch has been delivered.\n"
-"Enjoy your meal!"
-msgstr ""
-
 #. module: stock
 #. odoo-python
 #: code:addons/stock/models/stock_quant.py:0
diff --git a/addons/stock/static/src/widgets/generate_serial.js b/addons/stock/static/src/widgets/generate_serial.js
index 2756cdb87f7..c9611299e72 100644
--- a/addons/stock/static/src/widgets/generate_serial.js
+++ b/addons/stock/static/src/widgets/generate_serial.js
@@ -7,7 +7,7 @@ import { useService } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
 import { parseInteger  } from "@web/views/fields/parsers";
 import { getId } from "@web/model/relational_model/utils";
-import { Component, useRef, xml, onMounted } from "@odoo/owl";
+import { Component, useRef, onMounted } from "@odoo/owl";
 
 export class GenerateDialog extends Component {
     setup() {
@@ -83,7 +83,7 @@ GenerateDialog.props = {
 GenerateDialog.components = { Dialog };
 
 class GenerateSerials extends Component {
-    static template = xml`<button class="btn btn-link" t-on-click="openDialog">Generate Serials</button>`;
+    static template = "stock.GenerateSerials";
 
     setup(){
         this.dialog = useService("dialog");
@@ -98,7 +98,7 @@ class GenerateSerials extends Component {
 }
 
 class ImportLots extends Component {
-    static template = xml`<button class="btn btn-link" t-on-click="openDialog">Import Lots</button>`;
+    static template = "stock.ImportLots";
 
     setup(){
         this.dialog = useService("dialog");
diff --git a/addons/stock/static/src/widgets/lots_dialog.xml b/addons/stock/static/src/widgets/lots_dialog.xml
index c3df258dfb1..51579203358 100644
--- a/addons/stock/static/src/widgets/lots_dialog.xml
+++ b/addons/stock/static/src/widgets/lots_dialog.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
+    <t t-name="stock.GenerateSerials">
+        <button class="btn btn-link" t-on-click="openDialog">Generate Serials/Lots</button>
+    </t>
+    <t t-name="stock.ImportLots">
+        <button class="btn btn-link" t-on-click="openDialog">Import Serials/Lots</button>
+    </t>
     <t t-name="stock.generate_serial_dialog">
         <Dialog size="size" title="title" withBodyPadding="false">
             <t t-set-slot="footer">