diff --git a/deltatech_report_prn/static/src/js/action_manager.esm.js b/deltatech_report_prn/static/src/js/action_manager.esm.js
index afa05d99d6..65aa1a8feb 100644
--- a/deltatech_report_prn/static/src/js/action_manager.esm.js
+++ b/deltatech_report_prn/static/src/js/action_manager.esm.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
-// import config from "web.config";
 import {download} from "@web/core/network/download";
+import {isMobileOS} from "@web/core/browser/feature_detection";
 import {registry} from "@web/core/registry";
 
 async function prnReportHandler(action, options, env) {
-    if (config.device.isMobile) {
+    if (isMobileOS()) {
         return;
     }
     if (action.device_id) {
diff --git a/deltatech_service_base/security/service_security.xml b/deltatech_service_base/security/service_security.xml
index eed59a0f80..04ea1b0672 100644
--- a/deltatech_service_base/security/service_security.xml
+++ b/deltatech_service_base/security/service_security.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
+<odoo noupdate="1">
 
         <record id="module_category_service" model="ir.module.category">
             <field name="name">Service</field>
         </record>
+        <record id="module_category_warranty" model="ir.module.category">
+            <field name="name">Warranty</field>
+        </record>
         <record id="group_service_client" model="res.groups">
             <field name="name">Client</field>
             <field name="category_id" ref="module_category_service" />
@@ -21,7 +24,18 @@
             <field name="implied_ids" eval="[(4, ref('group_service_user'))]" />
             <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]" />
         </record>
-
+        <record id="group_warranty_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_category_warranty" />
+            <field name="implied_ids" eval="[(4, ref('group_service_user'))]" />
+            <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]" />
+        </record>
+        <record id="group_warranty_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="module_category_warranty" />
+            <field name="implied_ids" eval="[(4, ref('group_service_user')), (4, ref('group_warranty_user'))]" />
+            <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]" />
+        </record>
 
 
 </odoo>
diff --git a/deltatech_service_maintenance/__manifest__.py b/deltatech_service_maintenance/__manifest__.py
index 508897176a..1f805e2e2f 100644
--- a/deltatech_service_maintenance/__manifest__.py
+++ b/deltatech_service_maintenance/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Deltatech Services Maintenance",
     "summary": "Services Maintenance",
-    "version": "17.0.1.1.2",
+    "version": "17.0.1.1.3",
     "author": "Terrabit, Dorin Hongu",
     "website": "https://www.terrabit.ro",
     "category": "Services/Maintenance",
@@ -30,6 +30,8 @@
         "views/report_notification.xml",
         "views/report_order.xml",
         "views/service_work_center_view.xml",
+        "views/service_warranty_view.xml",
+        "views/res_config_view.xml",
         "security/ir.model.access.csv",
     ],
     "images": ["static/description/main_screenshot.png"],
diff --git a/deltatech_service_maintenance/data/data.xml b/deltatech_service_maintenance/data/data.xml
index 1da0b95f29..f5bf516138 100644
--- a/deltatech_service_maintenance/data/data.xml
+++ b/deltatech_service_maintenance/data/data.xml
@@ -8,6 +8,14 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+        <record id="sequence_warranty" model="ir.sequence">
+            <field name="name">Warranty</field>
+            <field name="code">service.warranty</field>
+            <field name="prefix">W/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
         <record id="sequence_order" model="ir.sequence">
             <field name="name">Service Order</field>
             <field name="code">service.order</field>
diff --git a/deltatech_service_maintenance/models/__init__.py b/deltatech_service_maintenance/models/__init__.py
index 78a898340a..32c1bc6dc6 100644
--- a/deltatech_service_maintenance/models/__init__.py
+++ b/deltatech_service_maintenance/models/__init__.py
@@ -12,3 +12,5 @@
 from . import service_equipment
 from . import stock
 from . import service_work_center
+from . import service_warranty
+from . import res_config_settings
diff --git a/deltatech_service_maintenance/models/res_config_settings.py b/deltatech_service_maintenance/models/res_config_settings.py
new file mode 100644
index 0000000000..73460eefc9
--- /dev/null
+++ b/deltatech_service_maintenance/models/res_config_settings.py
@@ -0,0 +1,13 @@
+# ©  2008-2021 Deltatech
+#              Dorin Hongu <dhongu(@)gmail(.)com
+# See README.rst file on addons root folder for license details
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    picking_type_for_warranty = fields.Many2one(
+        "stock.picking.type", string="Warranty picking type", config_parameter="service.picking_type_for_warranty"
+    )
diff --git a/deltatech_service_maintenance/models/service_warranty.py b/deltatech_service_maintenance/models/service_warranty.py
new file mode 100644
index 0000000000..aa1b91950e
--- /dev/null
+++ b/deltatech_service_maintenance/models/service_warranty.py
@@ -0,0 +1,260 @@
+# ©  2015-2021 Deltatech
+#              Dorin Hongu <dhongu(@)gmail(.)com
+# See README.rst file on addons root folder for license details
+
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+from odoo.tools.safe_eval import safe_eval
+
+# flux garantii si reconditionari
+
+
+class ServiceWarranty(models.Model):
+    _name = "service.warranty"
+    _description = "Warranty"
+    _inherit = ["mail.thread", "mail.activity.mixin"]
+
+    type = fields.Selection([("warranty", "Warranty"), ("recondition", "Recondition")])
+    name = fields.Char(string="Reference", readonly=True, index=True, default="/", copy=False)
+    date = fields.Datetime(
+        string="Date",
+        default=fields.Date.context_today,
+        readonly=True,
+    )
+    state = fields.Selection(
+        [
+            ("new", "New"),
+            ("assigned", "Assigned"),
+            ("progress", "In Progress"),
+            ("approval_requested", "Approval requested"),
+            ("approved", "Approved"),
+            ("done", "Done"),
+        ],
+        default="new",
+        string="Status",
+        tracking=True,
+    )
+
+    rec_state = fields.Selection(
+        [
+            ("new", "New"),
+            ("progress", "In Progress"),
+            ("done", "Done"),
+        ],
+        default="new",
+        string="Status",
+        tracking=True,
+    )
+
+    clarifications_state = fields.Selection(
+        [("required", "Required"), ("sent", "Sent")], string="Clarifications", tracking=True
+    )
+    equipment_id = fields.Many2one(
+        "service.equipment",
+        string="Equipment",
+        index=True,
+        readonly=True,
+    )
+    partner_id = fields.Many2one("res.partner", string="Customer")
+    has_agreement = fields.Boolean("Has service agreement", compute="_compute_service_agreement")
+    user_id = fields.Many2one("res.users", string="Responsible")
+    description = fields.Text("Notes", readonly=False)
+    picking_id = fields.Many2one("stock.picking", string="Consumables", copy=False)
+    sale_order_id = fields.Many2one("sale.order", string="Sale Order")
+    invoice_id = fields.Many2one("account.move", string="Invoice")
+    item_ids = fields.One2many(
+        "service.warranty.item",
+        "warranty_id",
+        string="Warranty Lines",
+        readonly=False,
+        copy=True,
+    )
+    total_amount = fields.Float(string="Total amount", compute="_compute_total_amount", store=True)
+
+    def _compute_service_agreement(self):
+        agreements_installed = (
+            self.env["ir.module.module"]
+            .sudo()
+            .search([("name", "=", "deltatech_service_agreement"), ("state", "=", "installed")])
+        )
+        for warranty in self:
+            if not agreements_installed or not warranty.partner_id:
+                warranty.has_agreement = False
+            else:
+                query = """
+                                    SELECT id, state FROM service_agreement agr
+                                    WHERE
+                                        state IN %(states)s
+                                        AND partner_id IN %(partners)s
+                                """
+                params = {
+                    "partners": tuple([warranty.partner_id.id, warranty.partner_id.commercial_partner_id.id]),
+                    "states": tuple(["draft", "open"]),
+                }
+                self.env.cr.execute(query, params=params)
+                res = self.env.cr.dictfetchall()
+                if res:
+                    warranty.has_agreement = True
+                else:
+                    warranty.has_agreement = False
+
+    @api.depends("item_ids")
+    def _compute_total_amount(self):
+        for warranty in self:
+            total_amount = 0.0
+            for line in warranty.item_ids:
+                total_amount += line.amount
+            warranty.total_amount = total_amount
+
+    @api.onchange("equipment_id")
+    def onchange_equipment_id(self):
+        if self.equipment_id:
+            self.user_id = self.equipment_id.technician_user_id or self.user_id
+            if self.equipment_id.serial_id:
+                move_lines = (
+                    self.env["stock.move.line"]
+                    .sudo()
+                    .search(
+                        [
+                            ("lot_id", "=", self.equipment_id.serial_id.id),
+                            ("state", "=", "done"),
+                            ("product_id", "=", self.equipment_id.product_id.id),
+                        ],
+                        order="date DESC",
+                    )
+                )
+                if move_lines:
+                    last_move = False
+                    if move_lines[0].location_dest_id.usage == "customer":
+                        # if last move seems like a delivery
+                        last_move = move_lines[0]
+                    else:
+                        for move in move_lines:
+                            if move.location_dest_id.usage == "customer":
+                                last_move = move
+                                break
+                    if last_move and last_move.sudo().move_id.sale_line_id:
+                        self.sudo().sale_order_id = last_move.move_id.sudo().sale_line_id.order_id
+                        invoice_lines = last_move.move_id.sudo().sale_line_id.invoice_lines
+                        invoices = invoice_lines.sudo().move_id
+                        if len(invoices.sudo()) == 1:
+                            if invoices.sudo().state == "posted" and invoices.sudo().move_type == "out_invoice":
+                                self.invoice_id = invoices.sudo()
+                                self.partner_id = invoices.partner_id
+        else:
+            self.invoice_id = False
+            self.sale_order_id = False
+            self.partner_id = False
+
+    def new_delivery_button(self):
+        # block picking if partner blocked
+        if self.partner_id:
+            if self.partner_id.picking_warn == "block":
+                raise UserError(self.partner_id.picking_warn_msg)
+            if self.partner_id.parent_id:
+                if self.partner_id.parent_id.picking_warn == "block":
+                    raise UserError(self.partner_id.parent_id.picking_warn_msg)
+
+        get_param = self.env["ir.config_parameter"].sudo().get_param
+        picking_type_id = safe_eval(get_param("service.picking_type_for_warranty", "False"))
+        if picking_type_id:
+            picking_type = self.env["stock.picking.type"].browse(picking_type_id)
+        else:
+            raise UserError(_("Please set a warranty picking type in settings"))
+
+        # context = self.get_context_default()
+        context = dict(self.env.context)
+        context.update(
+            {
+                "default_origin": self.name,
+                "default_picking_type_code": "outgoing",
+                "default_picking_type_id": picking_type_id,
+                "default_partner_id": self.partner_id.id,
+            }
+        )
+
+        if self.item_ids:
+            context["default_move_ids_without_package"] = []
+
+            for item in self.item_ids:
+                value = {
+                    "name": item.product_id.name,
+                    "product_id": item.product_id.id,
+                    "product_uom": item.product_id.uom_id.id,
+                    "product_uom_qty": item.quantity,
+                    "location_id": picking_type.default_location_src_id.id,
+                    "location_dest_id": picking_type.default_location_dest_id.id,
+                    "price_unit": item.product_id.standard_price,
+                }
+                context["default_move_ids_without_package"] += [(0, 0, value)]
+        context["warranty_id"] = self.id
+        return {
+            "name": _("Delivery for warranty"),
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "stock.picking",
+            "view_id": False,
+            "views": [[False, "form"]],
+            "context": context,
+            "type": "ir.actions.act_window",
+        }
+
+    @api.onchange("user_id")
+    def set_assigned(self):
+        if self.state == "new" and self.user_id:
+            self.state = "assigned"
+
+    def set_new(self):
+        if self.state == "assigned":
+            self.state = "new"
+            self.user_id = False
+
+    def set_in_progress(self):
+        if self.state == "assigned" and self.user_id:
+            self.state = "progress"
+
+    def request_approval(self):
+        self.state = "approval_requested"
+
+    def approve(self):
+        self.state = "approved"
+
+    def set_done(self):
+        self.state = "done"
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if "name" not in vals or ("name" in vals and vals["name"] == "/"):
+                vals["name"] = self.env["ir.sequence"].next_by_code("service.warranty")
+        return super().create(vals_list)
+
+
+class ServiceWarrantyItem(models.Model):
+    _name = "service.warranty.item"
+    _description = "Warranty Item"
+    _order = "warranty_id, sequence, id"
+
+    sequence = fields.Integer(string="Sequence", default=10)
+    name = fields.Char("Name")
+    warranty_id = fields.Many2one(
+        "service.warranty", string="Warranty", readonly=True, index=True, required=True, ondelete="cascade"
+    )
+    product_id = fields.Many2one("product.product", string="Product")
+    alternative_code = fields.Char(related="product_id.alternative_code")
+    quantity = fields.Float(string="Quantity", digits="Product Unit of Measure", default=1)
+    product_uom = fields.Many2one("uom.uom", string="Unit of Measure ")
+    note = fields.Char(string="Note")
+    price_unit = fields.Float(string="Unit price")
+    amount = fields.Float(string="Amount", compute="_compute_amount")
+
+    @api.onchange("product_id")
+    def onchange_product_id(self):
+        self.product_uom = self.product_id.uom_id
+        self.name = self.product_id.name
+        self.price_unit = self.product_id.standard_price
+
+    def _compute_amount(self):
+        for line in self:
+            line.amount = line.price_unit * line.quantity
diff --git a/deltatech_service_maintenance/models/stock.py b/deltatech_service_maintenance/models/stock.py
index d1e1544c4c..6e8e493259 100644
--- a/deltatech_service_maintenance/models/stock.py
+++ b/deltatech_service_maintenance/models/stock.py
@@ -3,6 +3,7 @@
 # See README.rst file on addons root folder for license details
 
 from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 
 
 class StockPicking(models.Model):
@@ -10,20 +11,26 @@ class StockPicking(models.Model):
 
     notification_id = fields.Many2one("service.notification", string="Notification", readonly=True)
     service_order_id = fields.Many2one("service.order", string="Service Order", readonly=True)
+    warranty_id = fields.Many2one("service.warranty", string="Warranty", readonly=True, copy=False)
 
-    @api.model_create_multi
+    @api.model
     @api.returns("self", lambda value: value.id)
-    def create(self, vals_list):
-        notification_id = self.env.context.get("notification_id", False)
-        for vals in vals_list:
+    def create(self, vals):
+        res = super().create(vals)
+        if res:
+            notification_id = self.env.context.get("notification_id", False)
+            warranty_id = self.env.context.get("warranty_id", False)
+
             if notification_id:
-                vals["notification_id"] = notification_id
-        picking = super().create(vals_list)
+                res.notification_id = notification_id
+                notification = self.env["service.notification"].browse(notification_id)
+                notification.write({"piking_id": res.id})
 
-        if notification_id and picking:
-            notification = self.env["service.notification"].browse(notification_id)
-            notification.write({"piking_id": picking[0].id})
-        return picking
+            if warranty_id:
+                res.warranty_id = warranty_id
+                warranty = self.env["service.warranty"].browse(warranty_id)
+                warranty.write({"picking_id": res.id})
+        return res
 
     def new_notification(self):
         self.ensure_one()
@@ -49,3 +56,41 @@ def new_notification(self):
             "context": context,
             "type": "ir.actions.act_window",
         }
+
+    def button_validate(self):
+        """
+        Write the actual values in warranty
+        """
+        res = super().button_validate()
+        for picking in self:
+            if picking.warranty_id:
+                for move in picking.move_ids:
+                    value = 0.0
+                    for layer in move.stock_valuation_layer_ids:
+                        value = +layer.value
+                    line = picking.warranty_id.item_ids.filtered(lambda p: p.product_id == move.product_id)
+                    if not line or len(line) > 1:
+                        raise UserError(_("No lines or multiple lines in linked warranty found"))
+                    else:
+                        line.write({"price_unit": value / line.quantity if line.quantity else 0.0})
+        return res
+
+
+class StockLot(models.Model):
+    _inherit = "stock.lot"
+
+    def action_lot_open_warranty(self):
+        self.ensure_one()
+        equipments = self.env["service.equipment"].search([("serial_id", "=", self.id)])
+        if equipments:
+            warranties = self.env["service.warranty"].search([("equipment_id", "in", equipments.ids)])
+            if warranties:
+                action = {
+                    "res_model": "service.warranty",
+                    "type": "ir.actions.act_window",
+                    "name": _("Warranties for serial %s", self.name),
+                    "domain": [("id", "in", warranties.ids)],
+                    "view_mode": "tree,form",
+                }
+                return action
+        raise UserError(_("No warranties for this serial!"))
diff --git a/deltatech_service_maintenance/security/ir.model.access.csv b/deltatech_service_maintenance/security/ir.model.access.csv
index b29f4be2d2..5e3595c2c6 100644
--- a/deltatech_service_maintenance/security/ir.model.access.csv
+++ b/deltatech_service_maintenance/security/ir.model.access.csv
@@ -41,3 +41,6 @@ access_service_work_center_manager,access_service_work_center,model_service_work
 
 
 access_service_notification_operation_manager,access_service_notification_operation,model_service_notification_operation,deltatech_service_base.group_service_manager,1,1,1,1
+
+access_service_warranty_manager,access_service_warranty_manager,model_service_warranty,deltatech_service_base.group_warranty_user,1,1,1,1
+access_service_warranty_item_manager,access_service_warranty_item,model_service_warranty_item,deltatech_service_base.group_warranty_user,1,1,1,1
diff --git a/deltatech_service_maintenance/views/res_config_view.xml b/deltatech_service_maintenance/views/res_config_view.xml
new file mode 100644
index 0000000000..2c4a800d21
--- /dev/null
+++ b/deltatech_service_maintenance/views/res_config_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="res_config_settings_view_form_stock" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <block name="operations_setting_container" position="inside">
+                <setting id="picking_type_for_warranty" help="Picking type for warranty operations">
+                    <field name="picking_type_for_warranty" />
+                </setting>
+            </block>
+
+<!--            <xpath expr="//div[@data-key='stock']//div[@name='shipping_setting_container']" position="inside">-->
+
+
+<!--                <div class="col-12 col-lg-6 o_setting_box">-->
+<!--                    <div class="o_setting_right_pane">-->
+<!--                        <label for="picking_type_for_warranty" />-->
+<!--                        <div class="text-muted">-->
+<!--                           Picking type for warranty transfers.-->
+<!--                        </div>-->
+<!--                        <div class="content-group">-->
+<!--                            <div class="mt16">-->
+<!--                                <field name="picking_type_for_warranty" class="o_light_label" widget="selection" />-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
+
+
+<!--            </xpath>-->
+        </field>
+    </record>
+
+</odoo>
diff --git a/deltatech_service_maintenance/views/service_warranty_view.xml b/deltatech_service_maintenance/views/service_warranty_view.xml
new file mode 100644
index 0000000000..01a7a33182
--- /dev/null
+++ b/deltatech_service_maintenance/views/service_warranty_view.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_service_warranty_tree" model="ir.ui.view">
+        <field name="name">service.warranty.tree</field>
+        <field name="model">service.warranty</field>
+        <field name="arch" type="xml">
+            <tree
+                default_order="create_date desc"
+                sample="1"
+                decoration-info="state == 'new'"
+                decoration-danger="state == 'approval_requested'"
+                decoration-success="state == 'approved'"
+                decoration-muted="state == 'done'"
+                decoration-primary="state == 'new'"
+                decoration-warning="state == 'progress'"
+                decoration-bf="clarifications_state == 'required'"
+                decoration-it="clarifications_state == 'sent'"
+            >
+                <field name="create_date" optional="show" string="Create date" />
+                <field name="name" decoration-bf="1" />
+                <field name="date" optional="show" string="Warranty date" />
+                <field name="equipment_id" />
+                <field name="sale_order_id" />
+                <field name="partner_id" />
+                <field name="user_id" widget="many2one_avatar_user" />
+                <field name="clarifications_state" />
+                <field
+                    name='state'
+                    widget="badge"
+                    decoration-danger="state == 'new'  "
+                    decoration-success="state == 'assigned'  "
+                    decoration-primary="state == 'progress'  "
+                />
+                <field name="total_amount" sum="total_amount" />
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="view_service_warranty_form" model="ir.ui.view">
+        <field name="name">service.warranty.form</field>
+        <field name="model">service.warranty</field>
+        <field name="arch" type="xml">
+            <form string="Warranty">
+                <header>
+
+                    <button
+                        name="new_delivery_button"
+                        type="object"
+                        class="oe_highlight"
+                        string="New transfer"
+                        invisible="state != 'approved' or picking_id != False"
+                    />
+                    <button
+                        name="set_new"
+                        type="object"
+                        class="oe_highlight"
+                        string="Set new"
+                        invisible="state != 'assigned'"
+                    />
+                    <button
+                        name="set_in_progress"
+                        type="object"
+                        class="oe_highlight"
+                        string="Set in progress"
+                        invisible="state != 'assigned'"
+                    />
+                    <button
+                        name="request_approval"
+                        type="object"
+                        class="oe_highlight"
+                        string="Request approval"
+                        invisible="state != 'progress'"
+                    />
+                    <button
+                        name="approve"
+                        type="object"
+                        class="oe_highlight"
+                        string="Approve"
+                        invisible="state != 'approval_requested'"
+                        groups="deltatech_service_base.group_warranty_manager"
+                    />
+                    <button
+                        name="set_done"
+                        type="object"
+                        class="oe_highlight"
+                        string="Set done"
+                        invisible="state != 'approved'"
+                    />
+                    <field name="type" invisible="1" />
+                    <field
+                        name="state"
+                        widget="statusbar"
+                        options="{'clickable': '1'}"
+                        invisible="type != 'warranty'"
+                    />
+                    <field
+                        name="rec_state"
+                        widget="statusbar"
+                        options="{'clickable': '1'}"
+                        invisible="type != 'recondition'"
+                    />
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" invisible="name == '/'" readonly="1" />
+                        </h1>
+                    </div>
+
+
+                    <group>
+                        <group>
+                            <field name="create_date" readonly="1" />
+                            <field name="date" invisible="type != 'warranty'" readonly="state != 'new'" />
+                            <field name="equipment_id" readonly="state not in ['new', 'assigned']" />
+                        </group>
+                        <group>
+                            <field name="sale_order_id" invisible="type != 'warranty'" />
+                            <field name="invoice_id" invisible="type != 'warranty'" />
+                        </group>
+                        <group name="responsible">
+                            <field
+                                name="user_id"
+                                domain="[('share', '=', False)]"
+                                widget="many2one_avatar_user"
+                                readonly="state not in ['new', 'assigned']"
+                            />
+                        </group>
+                        <group name="partner" invisible="type != 'warranty'">
+                            <field name="partner_id" required="type == 'warranty'" />
+                            <field name="has_agreement" />
+                            <field name="state" groups="deltatech_service_base.group_warranty_manager" />
+                        </group>
+                        <group>
+                            <field name="picking_id" readonly="1" invisible="type != 'warranty'" />
+                        </group>
+                        <group name="clarifications">
+                            <field name="clarifications_state" invisible="state != 'approval_requested'" />
+                        </group>
+                        <group colspan="2">
+                            <field
+                                name="description"
+                                widget="text"
+                                style="border: 2px solid red; font-weight:bold; padding: 2px;"
+                                readonly="state == 'done'"
+                            />
+                        </group>
+
+                    </group>
+                    <notebook>
+                        <page string="Components" name="lines">
+                            <field name="item_ids" mode="tree,kanban" readonly="state == 'done'">
+                                <tree editable="bottom">
+                                    <field name="sequence" widget="handle" />
+                                    <field name="product_id" />
+                                    <field name="alternative_code" />
+                                    <field name="name" />
+                                    <field name="quantity" />
+                                    <field name="product_uom" />
+                                    <field name="price_unit" readonly="1" force_save="1" />
+                                    <field name="amount" sum="amount" />
+                                    <field name="note" />
+                                </tree>
+
+                                <kanban class="o_kanban_mobile">
+                                    <field name="product_id" />
+                                    <field name="quantity" />
+                                    <field name="product_uom" />
+
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                                <div class="row">
+                                                    <div class="col-8">
+                                                        <strong>
+                                                            <span>
+                                                                <t t-esc="record.product_id.value" />
+                                                            </span>
+                                                        </strong>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-12 text-muted">
+                                                        <span>
+                                                            Quantity:
+                                                            <t t-esc="record.quantity.value" />
+                                                            <t t-esc="record.product_uom.value" />
+                                                        </span>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+
+
+                            </field>
+
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+
+
+    <!-- Search note -->
+    <record id="view_service_warranty_filter" model="ir.ui.view">
+        <field name="name">service.warranty.search</field>
+        <field name="model">service.warranty</field>
+        <field name="arch" type="xml">
+            <search string="Warranty">
+                <field name="name" />
+                <field name="user_id" />
+                <field name="partner_id" />
+                <field name="equipment_id" />
+                <field
+                    name="equipment_id"
+                    filter_domain="[ ('equipment_id.serial_no','ilike',self)]"
+                    string="Serial Number"
+                />
+
+                <separator />
+                <filter name="new" string="New" domain="[('state', '=', 'new')]" />
+                <filter name='assigned' string="Assigned" domain="[('state', '=', 'assigned')]" />
+                <filter name='progress' string="In Progress" domain="[('state', '=', 'progress')]" />
+                <filter name='done' string="Done" domain="[('state', '=', 'done')]" />
+                <filter
+                    name='cl_required'
+                    string="Clarifications required"
+                    domain="[('clarifications_state', '=', 'required')]"
+                />
+                <filter name='cl_sent' string="Clarifications sent" domain="[('clarifications_state', '=', 'sent')]" />
+                <separator />
+                <filter
+                    name='my'
+                    string="My"
+                    domain="[('user_id','=',uid)]"
+                    help="Notifications that are assigned to me"
+                />
+                <filter name="unassigned" string="Unassigned" domain="[('user_id','=', False)]" />
+                <group expand="0" string="Group By">
+                    <filter name="group_by_user_id" string="Responsible" context="{'group_by':'user_id'}" />
+                    <filter name="group_by_state" string="State" context="{'group_by':'state'}" />
+                    <filter name="group_by_equipment_id" string="Equipment" context="{'group_by':'equipment_id'}" />
+                    <filter
+                        name="group_by_clarifications"
+                        string="Clarifications"
+                        context="{'group_by':'clarifications_state'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+    <record id="action_service_warranty" model="ir.actions.act_window">
+        <field name="name">Warranty</field>
+        <field name="res_model">service.warranty</field>
+        <field name="view_mode">tree,form,activity</field>
+        <field name="domain">[('type', '=', 'warranty')]</field>
+        <field name="context">{'default_type': 'warranty'}</field>
+    </record>
+    <menuitem
+        name="Warranty"
+        id="menu_service_warranty"
+        action="action_service_warranty"
+        parent="deltatech_service_base.menu_service"
+        groups="deltatech_service_base.group_warranty_user"
+    />
+
+
+
+    <record id="action_service_recondition" model="ir.actions.act_window">
+        <field name="name">Reconditions</field>
+        <field name="res_model">service.warranty</field>
+        <field name="view_mode">tree,form,activity</field>
+        <field name="domain">[('type', '=', 'recondition')]</field>
+        <field name="context">{'default_type': 'recondition'}</field>
+    </record>
+    <menuitem
+        name="Reconditions"
+        id="menu_service_recondition"
+        action="action_service_recondition"
+        parent="deltatech_service_base.menu_service"
+        groups="deltatech_service_base.group_warranty_user"
+    />
+
+</odoo>