diff --git a/budget/__init__.py b/budget/__init__.py
new file mode 100644
index 00000000000..c536983e2b2
--- /dev/null
+++ b/budget/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import wizard
\ No newline at end of file
diff --git a/budget/__manifest__.py b/budget/__manifest__.py
new file mode 100644
index 00000000000..a476c8404f2
--- /dev/null
+++ b/budget/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    "name": "Budget",
+    "version": "1.0",
+    "depends": ["base","account"],
+    "data": [
+        "security/ir.model.access.csv",
+        "wizard/budget_wizard_views.xml",
+        "views/budget_views.xml",
+        "views/budget_line_views.xml",
+        "views/budget_menu_views.xml",
+    ],
+    "installable": True,
+    "application": True,
+    "license": "LGPL-3",
+}
\ No newline at end of file
diff --git a/budget/models/__init__.py b/budget/models/__init__.py
new file mode 100644
index 00000000000..5e24362f59d
--- /dev/null
+++ b/budget/models/__init__.py
@@ -0,0 +1,3 @@
+from . import budget
+from . import budget_lines
+from . import res_account_analytic_line
\ No newline at end of file
diff --git a/budget/models/budget.py b/budget/models/budget.py
new file mode 100644
index 00000000000..e6ea4eab1e1
--- /dev/null
+++ b/budget/models/budget.py
@@ -0,0 +1,104 @@
+from odoo import models, fields, api
+from odoo.exceptions import ValidationError,UserError
+
+class Budget(models.Model):
+    _name = "budget.budget"
+    _description = "Budget"
+    _inherit = ['mail.thread']
+
+    name = fields.Char('Budget Name', compute='_compute_budget_name', store=True)
+
+    color= fields.Integer(default=5)
+    user_id = fields.Many2one('res.users', 'Responsible', default=lambda self: self.env.user)
+    date_from = fields.Date('Start Date')
+    date_to = fields.Date('End Date')
+    active= fields.Boolean(default=True)
+    revision_id = fields.Many2one('budget.budget', string="Revision_id", readonly=True , tracking=True)
+    is_favorite = fields.Boolean(default=False)
+    state = fields.Selection(selection=[
+        ('draft', 'Draft'),
+        ('confirmed', 'Confirmed'),
+        ('revised', 'Revised'),
+        ('done', 'Done'),
+    ], string='Status', default='draft', required=True, readonly=True, copy=False)
+   
+
+    on_over_budget = fields.Selection([
+        ('warning', 'Show a warning'),
+        ('restriction', 'Restrict on creation'),    
+    ], string='Over Budget Policy',default="restriction")
+    currency_id = fields.Many2one('res.currency', string='Currency', required=True, default=lambda self: self.env.company.currency_id)
+    budget_lines = fields.One2many('budget.budget.lines', 'budget_id', 'Budget Lines', copy=True)
+    company_id = fields.Many2one('res.company', 'Company', required=True, default=lambda self: self.env.company)
+    analytic_account_ids = fields.Many2many('account.analytic.account')
+    warnings = fields.Text(compute="_check_over_budget")
+
+    
+    @api.constrains('date_from', 'date_to')
+    def _check_dates(self):
+        for record in self:
+            if record.date_from == record.date_to:
+                raise ValidationError("Start Date and End Date cannot be the same.")
+            elif record.date_to < record.date_from:
+                raise ValidationError("End Date must be after Start Date.")
+            else:
+                if record.state in ['draft', 'confirmed']:
+                    overlapping_budgets = self.search([
+                        ('id', '!=', record.id),  # Exclude the current record
+                        ('state', 'in', ['draft', 'confirmed']),
+                        ('date_from', '<=', record.date_to),
+                        ('date_to', '>=', record.date_from),
+                    ])
+                    if overlapping_budgets:
+                        raise UserError("Cannot create or update this budget because it overlaps with another budget")
+    @api.depends("budget_lines.over_budget")
+    def _check_over_budget(self):
+        for record in self:
+            if (
+                record.on_over_budget == "warning"
+                and any(ob > 0 for ob in record.budget_lines.mapped("over_budget")) > 0
+            ):
+                record.warnings = "Achieved amount exceeds the budget!"
+            else:
+                record.warnings = False
+
+    @api.depends('date_from', 'date_to')
+    def _compute_budget_name(self):
+        for record in self:
+            record.name = f"Budget:({record.date_from} to {record.date_to})"
+
+    def action_budget_confirm(self):
+        if self.state != 'draft':
+            raise ValidationError("Only budgets in draft state can be confirmed.")
+        self.write({'state': 'confirmed'})
+
+
+    def action_budget_revise(self):
+        if self.state != "confirmed":
+            raise UserError("Only confirmed budgets can be revised.")
+        self.ensure_one()
+        new_budget_vals = self.copy_data()[0] 
+        new_budget_vals['revision_id'] = self.id 
+        new_budget_vals['state'] = 'draft'
+      
+        self.active = False
+        self.state = 'revised'
+        new_budget = self.create(new_budget_vals)
+        self.message_post(
+        body=f"The budget has been revised. A new draft budget has been created with ID {new_budget.id}.",
+        subtype_xmlid="mail.mt_note"  
+    )
+    
+        return new_budget
+       
+
+    def action_budget_draft(self):
+        if self.state not in ['confirmed', 'revised']:
+            raise ValidationError("Only confirmed or revised budgets can be set back to draft.")
+        self.write({'state': 'draft'})    
+
+
+    def action_budget_done(self):
+        if self.state != 'revised':
+            raise ValidationError("Only revised budgets can be marked as done.")
+        self.write({'state': 'done'})        
diff --git a/budget/models/budget_lines.py b/budget/models/budget_lines.py
new file mode 100644
index 00000000000..5ba85da34a5
--- /dev/null
+++ b/budget/models/budget_lines.py
@@ -0,0 +1,68 @@
+from odoo import fields, models,api
+from odoo.exceptions import ValidationError,UserError
+
+class BudgetLines(models.Model):
+    _name = "budget.budget.lines"
+    _description = "Budget Line"
+    user_id = fields.Many2one('res.users', 'Responsible', default=lambda self: self.env.user)
+    budget_start_date = fields.Date(related="budget_id.date_from", readonly=True)
+    budget_end_date = fields.Date(related="budget_id.date_to", readonly=True)
+
+    budget_id = fields.Many2one('budget.budget', 'Budget', ondelete='cascade', index=True, required=True)
+    state = fields.Selection(related="budget_id.state", readonly=True)
+    analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account')
+    currency_id = fields.Many2one('res.currency', string='Currency', required=True, default=lambda self: self.env.company.currency_id)
+    planned_amount = fields.Monetary(
+        'Budget Amount', required=True,
+        default=0.0,
+        help="Amount you plan to earn/spend. Record a positive amount if it is a revenue and a negative amount if it is a cost.")
+    practical_amount = fields.Monetary(string='Achieved Amount' , default=0.0, store=True)
+
+    over_budget = fields.Monetary(
+        string="Over Budget",
+        default=0.0,
+        compute="_compute_practical_amount",
+        help="The amount by which the budget line exceeds its allocated budget.",
+        store=True
+    )
+    count= fields.Integer('Count',computed="_compute_practical_amount",default=0, readonly=True)
+    percentage = fields.Float(default=0.0,compute="_compute_achieved_percentage",
+        help="Comparison between practical and planned amount. This measure tells you if you are below or over budget.")
+
+
+    @api.depends("practical_amount", "planned_amount")
+    def _compute_achieved_percentage(self):
+        for record in self:
+            if record.planned_amount:
+                record.percentage = (
+                    record.practical_amount / record.planned_amount
+                ) * 100
+
+    def action_view_analytic_lines(self):
+        if not self.budget_id:
+            raise UserError("No budget linked to this budget line.")
+
+        budget_start_date = self.budget_id.date_from
+        budget_end_date = self.budget_id.date_to
+
+        return {
+            "type": "ir.actions.act_window",
+            "name": "Analytic Lines",
+            "res_model": "account.analytic.line",
+            "view_mode": "list",
+            "target": "current",
+            "context": {
+                "default_account_id": self.analytic_account_id.id,
+                "budget_start_date": budget_start_date,
+                "budget_end_date": budget_end_date,
+            },
+            "domain": [
+                ("account_id", "=", self.analytic_account_id.id),
+                ("date", ">=", budget_start_date),
+                ("date", "<=", budget_end_date),
+                ("amount", "<", 0),
+            ],
+        }            
+
+
+   
\ No newline at end of file
diff --git a/budget/models/res_account_analytic_line.py b/budget/models/res_account_analytic_line.py
new file mode 100644
index 00000000000..3d68750c223
--- /dev/null
+++ b/budget/models/res_account_analytic_line.py
@@ -0,0 +1,11 @@
+from odoo import models, fields, api
+from odoo.exceptions import ValidationError
+
+class AccountAnalyticLine(models.Model):
+    _inherit = "account.analytic.line"
+
+    budget_line_id = fields.Many2one('budget.budget.lines', 'Budget Line')
+    # account_id = fields.Many2one('account.analytic.account', 'Automatic Account', related='budget_line_id.analytic_account_id.auto_account_id')
+
+   
+    
diff --git a/budget/security/ir.model.access.csv b/budget/security/ir.model.access.csv
new file mode 100644
index 00000000000..b968629c318
--- /dev/null
+++ b/budget/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+budget.access_budget_budget,access_budget_budget,budget.model_budget_budget,base.group_user,1,1,1,1
+access_budget_lines_user,access_budget_lines,model_budget_budget_lines,base.group_user,1,1,1,1
+budget.access_budget_wizard,access_budget_wizard,budget.model_budget_wizard,base.group_user,1,1,1,1
diff --git a/budget/views/budget_line_views.xml b/budget/views/budget_line_views.xml
new file mode 100644
index 00000000000..c5c20e9fc1f
--- /dev/null
+++ b/budget/views/budget_line_views.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_budget_line_list" model="ir.ui.view">
+        <field name="name">budget.line.list</field>
+        <field name="model">budget.budget.lines</field>
+        <field name="arch" type="xml">
+            <list string="Budget Lines" default_order="id desc" create="0">
+
+                <field name="currency_id" column_invisible="1" />
+                <field name="budget_id" />
+                <field string="Analytic Account" name="analytic_account_id" />
+                <field string="Budget Amount" name="planned_amount" />
+                <field string="Achieved Amount" name="practical_amount" />
+            </list>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="view_budget_budget_line_pivot">
+        <field name="name">budget.budget.line.pivot</field>
+        <field name="model">budget.budget.lines</field>
+        <field name="arch" type="xml">
+            <pivot string="Budget Lines" sample="1">
+                <field name="analytic_account_id" type="row" />
+                <field name="count" />
+            </pivot>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_budget_line_graph">
+        <field name="name">budget.budget.line.graph</field>
+        <field name="model">budget.budget.lines</field>
+        <field name="arch" type="xml">
+            <graph string="Budget Lines" sample="1" disable_linking="1" stacked="0">
+                <field name="analytic_account_id" type="row" />
+                <field name="practical_amount" type="measure" operator="+"/>
+                <field name="over_budget" type="measure" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="view_budget_budget_line_gantt" model="ir.ui.view">
+        <field name="name">budget.budget.line.gantt</field>
+        <field name="model">budget.budget.lines</field>
+        <field name="arch" type="xml">
+            <gantt string="Budget Gantt" color="analytic_account_id" display_mode="sparse" progress_bar="analytic_account_id" date_start="budget_start_date" date_stop="budget_end_date" default_scale="month" default_group_by="budget_id">
+
+            <field name="user_id"  string="Responsible" widget="many2one_avatar" />
+            </gantt>
+        </field>
+    </record>
+
+
+
+    <record model="ir.actions.act_window" id="action_budget_budget_line">
+        <field name="name">Budget lines</field>
+        <field name="res_model">budget.budget.lines</field>
+        <field name="view_mode">list,pivot,graph,gantt</field>
+        <field name="view_id" ref="budget.view_budget_line_list" />
+
+    </record>
+
+
+</odoo>
\ No newline at end of file
diff --git a/budget/views/budget_menu_views.xml b/budget/views/budget_menu_views.xml
new file mode 100644
index 00000000000..c267473bfd6
--- /dev/null
+++ b/budget/views/budget_menu_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<menuitem id="budget_menu_root" name="Budget">
+    <menuitem id="budget_first_level_menu" name="Budgets">
+    </menuitem>
+        <menuitem id="budget_menu_action" action="budget_action"/>
+
+
+ <menuitem id="budget_first_level_menu" name="Budget lines">
+    </menuitem>
+        <menuitem id="budget_line_menu_action" action="action_budget_budget_line"/>
+</menuitem>
+</odoo>
\ No newline at end of file
diff --git a/budget/views/budget_views.xml b/budget/views/budget_views.xml
new file mode 100644
index 00000000000..75c63c4f92f
--- /dev/null
+++ b/budget/views/budget_views.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="budget_action" model="ir.actions.act_window">
+        <field name="name">Budgets</field>
+        <field name="res_model">budget.budget</field>
+        <field name="view_mode">kanban,form,list</field>
+    </record>
+
+    <record id="open_create_multiple_budget" model="ir.actions.act_window">
+        <field name="name">Create Multiple Budgets</field>
+        <field name="res_model">budget.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_budget_wizard" />
+        <field name="target">new</field>
+    </record>
+
+
+
+    <record id="view_budget_kanban" model="ir.ui.view">
+        <field name="name">budget.budget.kanban</field>
+        <field name="model">budget.budget</field>
+        <field name="arch" type="xml">
+            <kanban sample="1" can_open="0" highlight_color="color" type="action" action="%(budget.action_budget_budget_line)d">
+                <header>
+                    <button name="%(open_create_multiple_budget)d" type="action" string=" Generate Budgets" display="always"/>
+                </header>
+
+                <templates>
+                    <t t-name="menu">
+                        <div class="container">
+                            <div class="row">
+                                <div name="card_menu_view">
+                                    <div role="menuitem" aria-haspopup="true">
+                                        <a class="dropdown-item" role="menuitem" name="budget_action" type="open">
+                                            Configuration</a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div role="menuitem" aria-haspopup="true" class="col-6">
+                                    <field name="color" widget="kanban_color_picker" />
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                    <t t-name="card">
+                        <div style="display:flex;justify-content:space-between;flex-direction:column">
+                            <div style="display:flex;">
+                                <field name="is_favorite" widget="boolean_favorite" nolabel="1" />
+                                <h3>
+                                    <field name="name" />
+                                </h3>
+                            </div>
+                            <div style="display:flex;">
+                                <div t-if="record.date_to.raw_value or record.date_from.raw_value" class="text-muted">
+                                    <span class="fa fa-clock-o me-2" title="Dates"></span>
+                                    <field name="date_from" />
+                                    <i t-if="record.date_to.raw_value and record.date_from.raw_value" class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" />
+                                    <field name="date_to" />
+                                </div>
+                            </div>
+                        </div>
+                        <footer class="mt-auto pt-0 ms-1">
+                            <div class="d-flex ms-auto align-items-center">
+                                <field name="user_id" string="Responsible" widget="many2one_avatar_user" domain="[('share', '=', False)]" class="me-1" />
+                                <field name="state" string="Status" widget="state_selection"/>
+                            </div>
+                        </footer>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="view_budget_form" model="ir.ui.view">
+        <field name="name">budget.budget.form</field>
+        <field name="model">budget.budget</field>
+        <field name="arch" type="xml">
+            <form string="Budget">
+                <field name="state" invisible="1" />
+                <div class="alert alert-warning" role="alert" name="warnings" invisible="not warnings">
+                    <field name="warnings" class="o_field_html" />
+                </div>
+                <header>
+                    <button name="action_budget_draft" type="object" string="Reset to Draft" invisible="state in ['draft','revised','done']" />
+                    <button name="action_budget_confirm" type="object" string="Confirm" invisible="state in ['revised','done','confirmed']" />
+                    <button name="action_budget_revise" type="object" string="Revise" invisible="state in ['revised','done']" />
+                    <button name="action_budget_done" type="object" string="Done" invisible="state in ['done']" />
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,revised,done" />
+                </header>
+                <sheet>
+                    <h5> Budget name</h5>
+
+                    <field name="name" />
+                    <field name="currency_id" invisible="1" />
+                    <field name="active" invisible="1" />
+                    <group>
+                        <group>
+                            <field name="user_id" />
+                        </group>
+                        <group>
+                            <field name="date_from" string="Period" widget="daterange" options="{'end_date_field': 'date_to', 'always_range': '1'}" optional="hide" />
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="company_id" />
+                        </group>
+                        <group>
+                            <field name="on_over_budget" />
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="revision_id" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="Budget Lines">
+                            <field name="budget_lines">
+                                <list no_open="1" create="state in ['draft']" editable="bottom">
+                                    <field name="state" column_invisible="1" />
+                                    <field name="currency_id" column_invisible="1" />
+                                    <field name="analytic_account_id" string="Analytic Account" readonly="state not in ['draft']" />
+                                    <field name="planned_amount" string="Budget Amount" readonly="state not in ['draft']" />
+                                    <field name="practical_amount" string="Achieved Amount" />
+                                    <field name="percentage" string="Achieved (%)" widget="progressbar" options="{'max_value': 100}" />
+                                    <button name="action_view_analytic_lines" type="object" string="View" />
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter />
+            </form>
+        </field>
+    </record>
+
+    <record id="view_budget_list" model="ir.ui.view">
+        <field name="name">budget.budget.list</field>
+        <field name="model">budget.budget</field>
+        <field name="arch" type="xml">
+            <list string="Budget">
+                <field name="name"/>
+
+            </list>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/budget/wizard/__init__.py b/budget/wizard/__init__.py
new file mode 100644
index 00000000000..b70dd08917a
--- /dev/null
+++ b/budget/wizard/__init__.py
@@ -0,0 +1 @@
+from . import budget_wizard
\ No newline at end of file
diff --git a/budget/wizard/budget_wizard.py b/budget/wizard/budget_wizard.py
new file mode 100644
index 00000000000..b3f4a323db4
--- /dev/null
+++ b/budget/wizard/budget_wizard.py
@@ -0,0 +1,62 @@
+from odoo import models, fields,Command
+from odoo.exceptions import ValidationError
+from dateutil.relativedelta import relativedelta
+from datetime import timedelta
+
+class BudgetWizard(models.TransientModel):
+    _name = "budget.wizard"
+    _description = "Budget Wizard"
+
+    date_from = fields.Date(required=True, string="Start Date")
+    date_to = fields.Date(
+        string="Expiration Date",
+        required=True,
+        index=True,
+    )
+    periods = fields.Selection(
+        selection=[("monthly", "Monthly"), ("quarterly", "Quarterly")],
+        required=True,
+        default="monthly",
+    )
+    analytical_plan_ids = fields.Many2many("account.analytic.plan", string="Analytic Accounts")
+
+    def action_add_budget(self):
+        if self.date_from >= self.date_to:
+            raise ValidationError("Start Date must be before Expiration Date.")
+
+        current_date = self.date_from
+        budget_entries = []
+
+        while current_date <= self.date_to:
+            
+            end_of_month = current_date + relativedelta(day=31)
+
+            
+            if end_of_month > self.date_to:
+                end_of_month = self.date_to
+                
+            
+            budget_entry = {
+                "name": f"Budget from {current_date.strftime('%d-%m-%Y')} to {end_of_month.strftime('%d-%m-%Y')}",
+                "date_from": current_date,
+                "date_to": end_of_month,
+                "budget_lines": [],
+            }
+
+            for analytic_account in self.analytic_account_ids:
+                budget_entry["budget_lines"].append(
+                    Command.create({
+                        "analytic_account_id": analytic_account.id,
+                    })
+                )
+            budget_entries.append(budget_entry)
+
+            
+            current_date = end_of_month + timedelta(days=1)
+
+            if current_date > self.date_to:
+                break
+
+        self.env["budget.budget"].create(budget_entries)
+
+        return {"type": "ir.actions.act_window_close"}
\ No newline at end of file
diff --git a/budget/wizard/budget_wizard_views.xml b/budget/wizard/budget_wizard_views.xml
new file mode 100644
index 00000000000..147ef1d32a6
--- /dev/null
+++ b/budget/wizard/budget_wizard_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_budget_wizard" model="ir.ui.view">
+        <field name="name">budget.wizard.form</field>
+        <field name="model">budget.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Create Multiple Budgets">
+                <sheet>
+                    <group>
+                        <field name="date_from" string="Duration" widget="daterange"
+                            options="{'end_date_field': 'date_to', 'always_range': '1'}"
+                            optional="hide" />
+                        <field name="date_to" invisible="1" />
+                        <field name="periods" widget="radio" />
+                    </group>
+                    <group class="mb16">
+
+                        <field name="analytical_plan_ids" string="Analytic Accounts"
+                            widget="many2many_tags" />
+                    </group>
+                </sheet>
+                <footer>
+                    <button string="Create" name="action_add_budget" type="object"
+                        class="btn-primary" default_focus="1" />
+                    <button string="Discard" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+     
+</odoo>
\ No newline at end of file
diff --git a/estate/__init__.py b/estate/__init__.py
new file mode 100644
index 00000000000..c536983e2b2
--- /dev/null
+++ b/estate/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import wizard
\ No newline at end of file
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
new file mode 100644
index 00000000000..1bc3d80ed88
--- /dev/null
+++ b/estate/__manifest__.py
@@ -0,0 +1,33 @@
+{
+    "name": "estate",
+    "category": "real estate",
+    "category": "Estate/Brokerage",
+    "summary": "create a estate property",
+    "website": "https://www.odoo.com",
+    "depends": ["base","mail"],
+    "installable": True,
+    "application": True,
+    "license": "LGPL-3",
+    "data": [
+        "security/security.xml",
+        "security/ir.model.access.csv",
+         "wizard/estate_property_offer_wizard_views.xml",
+        "views/estate_property_views.xml",
+        "views/estate_property_offer_views.xml",
+        "views/estate_property_type_views.xml",
+        "views/estate_property_tags_views.xml",
+        "views/estate_property_resusers_views.xml",
+        "views/estate_menus.xml",
+        "data/estate_property_type_data.xml",
+        "report/ estate_property_reports.xml",
+        "report/ estate_property_templates.xml",
+        "report/estate_property_offer_templates.xml",
+        "report/estate_property_resusers_report.xml",
+        "report/estate_property_resusers_templates.xml",
+        # "report/estate_property_company_info.xml"
+    ],
+    "demo": [
+        "demo/estate_demo_data.xml",
+        "demo/estate_offer_demo_data.xml",
+    ],
+}
diff --git a/estate/data/estate_property_type_data.xml b/estate/data/estate_property_type_data.xml
new file mode 100644
index 00000000000..bd1b0aaa16a
--- /dev/null
+++ b/estate/data/estate_property_type_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo> 
+    <record id="property_type_residential" model="estate.property.type">
+        <field name="name">Residential</field>
+    </record>
+    <record id="property_type_commercial" model="estate.property.type">
+        <field name="name">Commercial</field>
+    </record>
+    <record id="property_type_industrial" model="estate.property.type">
+        <field name="name">Industrial</field>
+    </record>
+    <record id="property_type_land" model="estate.property.type">
+        <field name="name">Land</field>
+    </record>
+</odoo>
diff --git a/estate/demo/estate_demo_data.xml b/estate/demo/estate_demo_data.xml
new file mode 100644
index 00000000000..2b490c56d18
--- /dev/null
+++ b/estate/demo/estate_demo_data.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="estate_property_big_villa" model="estate.property">
+        <field name="name">Big Villa</field>
+        <field name="state">new</field>
+        <field name="description">A nice and big villa</field>
+        <field name="postcode">12345</field>
+        <field name="date_availability">2020-02-02</field>
+        <field name="expected_price">1600000</field>
+        <field name="bedrooms">6</field>
+        <field name="living_area">100</field>
+        <field name="facades">4</field>
+        <field name="garage">True</field>
+        <field name="garden">True</field>
+        <field name="garden_area">100000</field>
+        <field name="garden_orientation">south</field>
+    </record>
+
+    <record id="estate_property_trailer_home" model="estate.property">
+        <field name="name">Trailer home</field>
+        <field name="state">cancelled</field>
+        <field name="description">Home in a trailer park</field>
+        <field name="postcode">54321</field>
+        <field name="date_availability">1970-01-01</field>
+        <field name="expected_price">100000</field>
+        <field name="bedrooms">1</field>
+        <field name="living_area">10</field>
+        <field name="facades">4</field>
+        <field name="garage">False</field>
+        <field name="garden">False</field>
+    </record>
+      <record id="estate_property_modern_apartment" model="estate.property">
+        <field name="name">Modern Apartment</field>
+        <field name="expected_price" eval="500000"/>
+        <field name="offer_ids" eval="[(0, 0, {
+            'partner_id': ref('base.res_partner_10'),
+            'price': 620000,
+            'validity': 15,
+        }), (0, 0, {
+            'partner_id': ref('base.res_partner_12'),
+            'price': 630000,
+            'validity': 10,
+        })]"/>
+    </record>
+</odoo>
diff --git a/estate/demo/estate_offer_demo_data.xml b/estate/demo/estate_offer_demo_data.xml
new file mode 100644
index 00000000000..06df5fa92a2
--- /dev/null
+++ b/estate/demo/estate_offer_demo_data.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="offer_azure_10000" model="estate.property.offer">
+        <field name="partner_id" ref="base.res_partner_10" /> 
+        <field name="property_id" ref="estate.estate_property_big_villa" />
+        <field name="price">10000</field>
+        <field name="validity">14</field>
+    </record>
+
+    <record id="offer_azure_1500000" model="estate.property.offer">
+        <field name="partner_id" ref="base.res_partner_12" /> 
+        <field name="property_id" ref="estate.estate_property_big_villa" />
+        <field name="price">1500000</field>
+        <field name="validity">14</field>
+    </record>
+
+    <record id="offer_deco_1500001" model="estate.property.offer">
+        <field name="partner_id" ref="base.res_partner_18" />
+        <field name="property_id" ref="estate.estate_property_big_villa" />
+        <field name="price">1500001</field>
+        <field name="validity">14</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..53b8ac8a1c1
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1,5 @@
+from . import estate_property
+from . import estate_property_offer
+from . import estate_property_resusers
+from . import estate_property_tags
+from . import estate_property_type
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
new file mode 100644
index 00000000000..e567003e4fd
--- /dev/null
+++ b/estate/models/estate_property.py
@@ -0,0 +1,169 @@
+from odoo import models, fields, api
+from datetime import timedelta, date
+from odoo.exceptions import UserError
+from odoo.exceptions import ValidationError
+from odoo.tools.float_utils import float_compare, float_is_zero
+
+
+class EstateProperty(models.Model):
+    _name = "estate.property"
+    _description = "Real Estate Property"
+    _order = 'id desc'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Char(required=True)
+    description = fields.Text(string="Description")
+    postcode = fields.Char(string="Postcode")
+    date_availability = fields.Date(copy=False, default=lambda self: date.today() + timedelta(days=90))
+    expected_price = fields.Float(string="Expected Price", required=True)
+    selling_price = fields.Float(string="Selling Price")
+    bedrooms = fields.Integer(default=2)
+    active = fields.Boolean(default=True)
+    living_area = fields.Integer(string="Living Area (sqm)")
+    facades = fields.Integer(string="Facades")
+    garage = fields.Boolean(string="Garage Available")
+    garden = fields.Boolean(string="Garden")
+    garden_area = fields.Integer(string="Garden Area (sqm)")
+    garden_orientation = fields.Selection(
+        string="Garden Orientation",
+        selection=[
+            ('north', "North"),
+            ('south', "South"),
+            ('east', "East"),
+            ('west', "West")
+        ]
+    )
+    state = fields.Selection(selection=[
+        ('new', 'New'),
+        ('offer_received', 'Offer Received'),
+        ('offer_accepted', 'Offer Accepted'),
+        ('sold', 'Sold'),
+        ('cancelled', 'Cancelled'),
+    ], default='new', string="Status", copy=False, tracking=True,  group_expand='_group_expand_states')    
+    property_type_id = fields.Many2one('estate.property.type', string="Property Type",
+    options={'no_create': True, 'no_edit': True}) 
+    buyer_id = fields.Many2one('res.partner', string="Buyer",copy=False)
+    seller_id = fields.Many2one('res.users', string="Salesperson", default=lambda self: self.env.user,required=False)
+    status = fields.Selection([('accepted', 'Accepted'), ('refused', 'Refused')], string="Status")
+    partner_id = fields.Many2one('res.partner', string="Partner", ondelete='restrict')
+    price = fields.Float(string="Price")
+    total_area = fields.Float(string="Total Area (sqm)", compute="_compute_total_area", store=True,copy=False)
+    best_offers = fields.Float(string="Best Offers")
+    offer_ids = fields.One2many(
+        'estate.property.offer', 
+        'property_id', 
+        string="Offers"
+    )
+    validity = fields.Integer(string="Validity (days)")
+    date_deadline = fields.Date(
+        string="Deadline",
+        compute="_compute_date_deadline",
+        inverse="_inverse_date_deadline",
+        store=True)
+    tag_ids = fields.Many2many(
+        'estate.property.tag',
+        string='Tags'
+    )
+    offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers")
+    best_price = fields.Float(string="Best Price", compute="_compute_best_price", store=True)
+    offer_received = fields.Boolean(string="Offer Received", compute="_compute_offer_received", store=True)
+    offer_accepted = fields.Boolean(string="Offer Accepted", compute="_compute_offer_accepted", store=True)
+    user_id = fields.Many2one('res.users', string="Salesperson")
+    company_id = fields.Many2one(
+        "res.company",
+        string="Company",
+        required=True,
+        default=lambda self: self.env.company,
+    )
+
+
+
+    
+    @api.onchange('garden')
+    def _onchange_garden(self):
+        if self.garden:
+            self.garden_area = 10
+            self.garden_orientation = 'north'
+        else:
+            self.garden_area = 0
+            self.garden_orientation = False
+    
+    def action_cancel(self):
+        self.state = 'canceled'  
+        for record in self:
+            if record.state == 'sold':
+                raise UserError("A sold property cannot be cancelled.")
+            record.state = 'cancelled'
+
+    def action_sold(self):
+        self.state = 'sold'
+        for record in self:
+            if record.state == 'cancelled':
+                raise UserError("A cancelled property cannot be sold.")
+            record.state = 'sold'
+    
+    _sql_constraints = [
+        ('expected_price_positive', 'CHECK(expected_price > 0)',
+         'The expected price must be strictly positive.'),
+        ('selling_price_positive', 'CHECK(selling_price >= 0)',
+         'The selling price must be positive.')
+    ]
+
+    @api.constrains('expected_price')
+    def _check_expected_price(self):
+     for record in self:
+        if record.expected_price <= 0:
+            raise ValidationError("The expected price must be strictly positive.")
+   
+
+    @api.depends('offer_ids.price')
+    def _compute_best_price(self):
+        for record in self:
+            record.best_price = max(record.offer_ids.mapped('price'), default=0)
+     
+    @api.depends('living_area', 'garden_area')
+    def _compute_total_area(self):
+        for record in self:
+            record.total_area = (record.living_area or 0) + (record.garden_area or 0)
+
+    @api.constrains('expected_price', 'selling_price')
+    def _check_selling_price(self):
+        for record in self:
+            if float_is_zero(record.selling_price, precision_rounding=0.01):
+                continue
+            min_price = record.expected_price * 0.9
+            # if float_compare(record.selling_price, min_price, precision_rounding=0.01) < 0:
+            #     raise ValidationError(
+            #         "The selling price cannot be lower than 90% of the expected price."
+            #     )
+   
+    @api.depends('state')
+    def _compute_offer_received(self):
+        for record in self:
+            record.offer_received = record.state == 'offer_received'
+
+    @api.depends('state')
+    def _compute_offer_accepted(self):
+        for record in self:
+            record.offer_accepted = record.state == 'offer_accepted' 
+
+    @api.ondelete(at_uninstall=False)
+    def _check_state_on_delete(self):
+         for record in self:
+             if record.state not in ('new', 'cancelled'):
+                 raise UserError(
+                     "You cannot delete a property unless it is in 'New' or 'Cancelled' state."
+                )
+                            
+    def action_helper_message(self):
+         # Logic to determine when to show the helper
+         if not self.search([]):
+             return {
+                 'type': 'ir.actions.client',
+                 'tag': 'display_notification',
+                 'params': {
+                     'title': 'No Properties Found',
+                     'message': 'Click the button to create your first property.',
+                     'type': 'warning',
+                 }
+             }    
\ No newline at end of file
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
new file mode 100644
index 00000000000..ab6d54b0e26
--- /dev/null
+++ b/estate/models/estate_property_offer.py
@@ -0,0 +1,91 @@
+from odoo import models, fields
+from datetime import timedelta
+from odoo.exceptions import UserError
+from odoo import models, fields, api
+
+
+class EstatePropertyOffer(models.Model):
+    _name = 'estate.property.offer'
+    _description = 'Real Estate Property Offer'
+    _order = 'price desc'
+    price = fields.Float()
+    state= fields.Selection([('new', 'New'),('accepted', 'Accepted'), ('refused', 'Refused')], string= "Status" ,default='new')
+    partner_id = fields.Many2one('res.partner', string="Partner", required=True)
+    property_id = fields.Many2one('estate.property', string="Property", required=True)
+    status = fields.Selection([('accepted', 'Accepted'), ('refused', 'Refused')], string="Status")
+    property_type_id = fields.Many2one(
+        related='property_id.property_type_id', 
+        string="Property Type", 
+        readonly=True,
+        store=True
+    )
+    buyer_id = fields.Many2one('res.partner', string="Buyer", required=False)
+    seller_id = fields.Many2one('res.partner', string="Salesperson", required=False)
+    validity = fields.Integer(string="Validity (days)")
+    date_deadline = fields.Date(
+        string="Deadline",
+        compute="_compute_date_deadline",
+        inverse="_inverse_date_deadline",
+        store=True
+    )
+   
+
+    @api.depends('create_date', 'validity')
+    def _compute_date_deadline(self):
+        for record in self:
+            if record.create_date:
+                record.date_deadline = record.create_date + timedelta(days=record.validity)
+            else:
+                record.date_deadline = fields.Date.today() + timedelta(days=record.validity)
+
+    def _inverse_date_deadline(self):
+        for record in self:
+            if record.create_date and record.date_deadline:
+                delta = (record.date_deadline - record.create_date.date()).days
+                record.validity = max(delta, 0)
+            else:
+                record.validity = 7
+
+    def action_offer_accepted(self):
+        for record in self:
+            record.status = 'accepted'
+            record.property_id.selling_price = record.price
+            record.property_id.buyer_id = record.partner_id
+            for offer in record.property_id.offer_ids:
+                if offer.id != record.id:
+                    offer.status = 'refused'
+        return True
+
+    def action_offer_refused(self):
+        for record in self:
+            record.status = 'refused'
+        return True
+
+    _sql_constraints = [
+        ('offer_price_positive', 'CHECK(price > 0)',
+         'The offer price must be strictly positive.')
+    ]
+
+    
+    @api.model
+    def create(self, vals):
+        # Ensure property_id exists in vals
+        property_id = self.env['estate.property'].browse(vals.get('property_id'))
+        if not property_id:
+            raise UserError("The property associated with this offer does not exist.")
+
+        # Check if the new offer amount is lower than any existing offers
+        existing_offers = self.search([('property_id', '=', property_id.id)])
+        for offer in existing_offers:
+            if vals.get('price', 0.0) <= offer.price:
+                raise UserError(
+                    "You cannot create an offer with a price lower than an existing offer."
+                )
+
+        # Update the property's state to 'Offer Received'
+        property_id.state = 'offer_received'
+
+        # Create the offer as usual
+        return super(EstatePropertyOffer, self).create(vals)   
+
+
diff --git a/estate/models/estate_property_resusers.py b/estate/models/estate_property_resusers.py
new file mode 100644
index 00000000000..6e53b1b0014
--- /dev/null
+++ b/estate/models/estate_property_resusers.py
@@ -0,0 +1,10 @@
+from odoo import models, fields
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+
+    property_ids = fields.One2many(
+        'estate.property', 
+        'seller_id', 
+        string="Properties",
+        domain=[('state', 'in', ['new', 'offer_received'])]  )
\ No newline at end of file
diff --git a/estate/models/estate_property_tags.py b/estate/models/estate_property_tags.py
new file mode 100644
index 00000000000..46a824a9ee0
--- /dev/null
+++ b/estate/models/estate_property_tags.py
@@ -0,0 +1,19 @@
+from odoo import models, fields
+class EstatePropertyTag(models.Model):
+    _name = 'estate.property.tag'
+    _description = 'Real Estate Property Tag'
+    _order = "name"
+
+    name = fields.Char(string="Tag Name", required=True)
+    color = fields.Integer(string='Color')
+    tag_ids = fields.Many2many(
+        'estate.property.tag',
+        'estate_property_tag_rel',  
+        'tag_id1',  
+        'tag_id2',
+        string="Related Tags"
+    )
+    _sql_constraints = [
+        ('unique_tag_name', 'UNIQUE(name)',
+         'The tag name must be unique.')
+    ]
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
new file mode 100644
index 00000000000..d8a50d3da09
--- /dev/null
+++ b/estate/models/estate_property_type.py
@@ -0,0 +1,34 @@
+from odoo import models, fields, api
+class EstatePropertyType(models.Model):
+    _name = 'estate.property.type'
+    _description = 'Real Estate Property Type'
+    _order = "sequence,name"
+
+    sequence = fields.Integer()
+    name = fields.Char(string="Type Name", required=True)
+    property_ids = fields.One2many('estate.property', 'property_type_id', string="Properties")
+    offer_ids = fields.One2many('estate.property.offer', 'property_type_id', string="Offers")
+    offer_count = fields.Integer(string="Offer Count", compute="_compute_offer_count")
+    
+    _sql_constraints = [
+        ('unique_type_name', 'UNIQUE(name)',
+         'The property type name must be unique.')
+    ]
+
+    @api.depends('offer_ids')
+    def _compute_offer_count(self):
+        for record in self:
+            record.offer_count = len(record.offer_ids)
+
+    def action_view_offers(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Offers',
+            'view_mode': 'tree,form',
+            'res_model': 'estate.property.offer',
+            'domain': [('property_type_id', '=', self.id)],
+            'context': {'default_property_type_id': self.id},
+        }        
+
+
diff --git a/estate/report/ estate_property_reports.xml b/estate/report/ estate_property_reports.xml
new file mode 100644
index 00000000000..1c4c3bf18fb
--- /dev/null
+++ b/estate/report/ estate_property_reports.xml	
@@ -0,0 +1,11 @@
+<odoo>
+     <record id="property_offer_report_action" model="ir.actions.report">
+        <field name="name">Property Offers Report</field>
+        <field name="model">estate.property</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">estate.report_property_offers</field>
+        <field name="report_file">estate.report_property_offers</field>
+        <field name="binding_model_id" ref="model_estate_property"/>
+    </record>       
+</odoo>
+
diff --git a/estate/report/ estate_property_templates.xml b/estate/report/ estate_property_templates.xml
new file mode 100644
index 00000000000..b6c0d0a1dc6
--- /dev/null
+++ b/estate/report/ estate_property_templates.xml	
@@ -0,0 +1,44 @@
+<odoo>
+    <template id="report_property_offers">
+    <t t-foreach="docs" t-as="doc">
+            <t t-call="web.html_container">
+        <t t-call="web.external_layout">
+            <div class="page">
+                <h2>Property Offers Report</h2>        
+                <p><strong>Property Name:</strong> <t t-esc="doc.name"/></p>
+                <p><strong>Expected Price:</strong> <t t-esc="doc.expected_price"/></p>
+                <div id="status"></div>
+
+                <t t-if="doc.offer_ids">
+                    <table class="table table-sm">
+                        <thead>
+                            <tr>
+                                <th>Buyer</th>
+                                <th>Offer Price</th>
+                                <th>Validity (Days)</th>
+                                <th>create_date</th>
+                                <th>Status</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <t t-foreach="doc.offer_ids" t-as="offer">
+                                <tr>
+                                    <td><t t-esc="offer.partner_id.name"/></td>
+                                    <td><t t-esc="offer.price"/></td>
+                                    <td><t t-esc="offer.validity"/></td>
+                                    <td><t t-esc="offer.create_date"/></td>
+                                    <td><t t-esc="offer.state"/></td>
+                                </tr>
+                            </t>
+                        </tbody>
+                    </table>
+                </t>
+                <t t-else="">
+                    <p>No offers yet for this property.</p>
+                </t>
+            </div>
+        </t>
+        </t>
+        </t>
+    </template>
+</odoo>
diff --git a/estate/report/estate_property_comapany_info.xml b/estate/report/estate_property_comapany_info.xml
new file mode 100644
index 00000000000..5c6c9414630
--- /dev/null
+++ b/estate/report/estate_property_comapany_info.xml
@@ -0,0 +1,30 @@
+<odoo>
+    <template id="report_company_information">
+        <t t-set="company" t-value="company" />
+        <div class="company-info" style="margin-bottom:50px;">
+            <div>
+                <img
+                    t-if="company.logo"
+                    class="o_company_logo_big"
+                    t-att-src="image_data_uri(company.logo)"
+                    alt="Company Logo"
+                />
+            </div>
+            <hr />
+            <div>
+                <strong t-field="company.name" />
+            </div>
+            <div>
+                <span t-field="company.street" />
+            </div>
+            <div>
+                <span t-field="company.city" />
+                <span t-field="company.state_id.code" />
+                <span t-field="company.zip" />
+            </div>
+            <div>
+                <span t-field="company.country_id.name" />
+            </div>
+        </div>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/report/estate_property_offer_templates.xml b/estate/report/estate_property_offer_templates.xml
new file mode 100644
index 00000000000..81818d634ea
--- /dev/null
+++ b/estate/report/estate_property_offer_templates.xml
@@ -0,0 +1,46 @@
+<odoo>
+    <template id="report_property_offers_table">
+        <t t-set="offers" t-value="offers" />
+        <t t-if="offers">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th style="font-weight: bold;">Price</th>
+                        <th style="font-weight: bold;">Partner</th>
+                        <th style="font-weight: bold;">Validity (days)</th>
+                        <th style="font-weight: bold;">Deadline</th>
+                        <th style="font-weight: bold;">Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <t t-foreach="offers" t-as="offer">
+                        <tr>
+                            <td>
+                                <span t-field="offer.price" />
+                            </td>
+                            <td>
+                                <span t-field="offer.partner_id" />
+                            </td>
+                            <td>
+                                <span t-field="offer.validity" />
+                            </td>
+                            <td>
+                                <span t-field="offer.date_deadline" />
+                            </td>
+                            <td>
+                                <span t-field="offer.status" />
+                            </td>
+                        </tr>
+                    </t>
+                </tbody>
+            </table>
+        </t>
+        <t t-else="">
+            <tr>
+                <td colspan="5" style="text-align: center; font-style: italic;">
+                    No offers has been made yet :(
+                </td>
+            </tr>
+        </t>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/report/estate_property_resusers_report.xml b/estate/report/estate_property_resusers_report.xml
new file mode 100644
index 00000000000..b92d65ab9ce
--- /dev/null
+++ b/estate/report/estate_property_resusers_report.xml
@@ -0,0 +1,11 @@
+<odoo>
+    <record id="action_print_report_by_salesman" model="ir.actions.report">
+        <field name="name">Real Estate Property List</field>
+        <field name="model">res.users</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">estate.report_property_by_salesman</field>
+        <field name="report_file">estate.report_property_by_salesman</field>
+        <field name="print_report_name">'Property Report By Salesman'</field>
+        <field name="binding_model_id" ref="base.model_res_users" />
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/report/estate_property_resusers_templates.xml b/estate/report/estate_property_resusers_templates.xml
new file mode 100644
index 00000000000..91a29150447
--- /dev/null
+++ b/estate/report/estate_property_resusers_templates.xml
@@ -0,0 +1,38 @@
+
+<odoo>
+    <template id="report_property_by_salesman">
+        <t t-foreach="docs" t-as="salesman">
+            <t t-call="web.html_container">
+                <t t-call="web.external_layout">
+                    <div class="page">
+                        <t t-call="estate.report_company_information">
+                            <t t-set="company" t-value="salesman.company_id" />
+                        </t>
+                        <h1>
+                            <strong>Salesman:</strong>
+                            <span t-field="salesman.display_name" />
+                        </h1>
+                        <div>
+                            <t t-foreach="salesman.property_ids" t-as="property">
+                                <h1>
+                                    <span t-field="property.name" />
+                                </h1>
+                                <div>
+                                    <strong>Expected Price: </strong>
+                                    <span t-field="property.expected_price" />
+                                </div>
+                                <div>
+                                    <strong>Status: </strong>
+                                    <span t-field="property.state" />
+                                </div>
+                                <t t-call="estate.report_property_offers_table">
+                                    <t t-set="offers" t-value="property.mapped('offer_ids')" />
+                                </t>
+                            </t>
+                        </div>
+                    </div>
+                </t>
+            </t>
+        </t>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
new file mode 100644
index 00000000000..dbe48de4734
--- /dev/null
+++ b/estate/security/ir.model.access.csv
@@ -0,0 +1,12 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+estate.access_property_user,access_estate_property_user,model_estate_property,base.group_user,1,1,1,1
+estate.access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,base.group_user,1,1,1,1
+estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1
+estate.access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1
+access_real_estate_manager,access_real_estate_manager,model_estate_property,estate_group_manager,1,1,1,0
+access_real_estate_agent,access_real_estate_agent,model_estate_property,estate_group_user,1,0,0,0
+access_type_read_only,access_type_read_only,model_estate_property_type,estate_group_user,1,0,0,0
+access_tag_read_only,access_tag_read_only,model_estate_property_tag,estate_group_user,1,0,0,0
+access_property_tag_manager,Property Tag - Manager,model_estate_property_tag,estate_group_manager,1,1,1,1
+access_property_type_manager,Property Type - Manager,model_estate_property_type,estate_group_manager,1,1,1,1
+access_estate_property_offer_wizard,model_estate_property,model_estate_property_offer_wizard,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/estate/security/security.xml b/estate/security/security.xml
new file mode 100644
index 00000000000..a396a7a8f29
--- /dev/null
+++ b/estate/security/security.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="base.module_category_estate_brokerage" model="ir.module.category">
+        <field name="name"> Estate/Brokerage</field>
+    </record>
+
+    <record id="estate_group_user" model="res.groups">
+        <field name="name">Real Estate Agent</field>
+        <field name="category_id" ref="base.module_category_estate_brokerage"/>
+    </record>
+
+
+    <record id="estate_group_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_estate_brokerage"/>
+    </record>
+    <!-- Rule for Real Estate Agents -->
+    <record id="rule_estate_agent_properties" model="ir.rule">
+        <field name="name">Agent: Access Own or Unassigned Properties</field>
+        <field name="model_id" ref="model_estate_property"/>
+        <field name="groups" eval="[(4, ref('estate_group_user'))]"/>
+        <field name="domain_force">[
+        '|', ('user_id', '=', user.id),
+             ('user_id', '=', False),
+             ('company_id', '=', user.company_id.id)
+    ]</field>
+
+    </record>
+
+    <!-- Rule for Real Estate Managers -->
+    <record id="rule_estate_manager_access" model="ir.rule">
+        <field name="name">Manager: Access All Properties</field>
+        <field name="model_id" ref="model_estate_property"/>
+        <field name="groups" eval="[(4, ref('estate_group_manager'))]"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+    </record>
+
+</odoo>
diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml
new file mode 100644
index 00000000000..d3537acac86
--- /dev/null
+++ b/estate/views/estate_menus.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+<menuitem id="estate_menu_root" name="Estate"/>
+    <menuitem id="estate_properties_menu" name="Advertisements" parent="estate_menu_root" action="estate_property_action"/>
+      <menuitem id="estate_properties_menu_two" name="Settings" parent="estate_menu_root"  groups="estate.estate_group_manager"/>
+        <menuitem id="estate_property_type_menu" name="Property Types" parent="estate_properties_menu_two" action="estate_property_type_action"/>
+          <menuitem id="estate_property_tag_menu" name="Property Tags" parent="estate_properties_menu_two" action="estate_property_tag_action"/>  
+</odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
new file mode 100644
index 00000000000..cd63f05badd
--- /dev/null
+++ b/estate/views/estate_property_offer_views.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="estate_property_offer_action" model="ir.actions.act_window">
+        <field name="name">Offers</field>
+        <field name="res_model">estate.property.offer</field>
+        <field name="view_mode">list,form</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
+    </record>
+
+
+    <record id="estate_property_offer_view_form" model="ir.ui.view">
+        <field name="name">estate.property.offers.form</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <form string='Offers'>
+                <sheet>
+                    <group>
+                        <field name="property_type_id" readonly="1"/>
+                        <field name="buyer_id"/>
+                        <field name="seller_id"/>
+                        <field name="price"/>
+                        <field name="partner_id" required="1"/>
+                        <field name="status"/>
+                        <field name="validity"/>
+                        <field name="date_deadline"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="estate_property_offer_view_list" model="ir.ui.view">
+        <field name="name">estate.property.offer.list</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <list string="Offers" editable="bottom" decoration-danger="state == 'refused'" decoration-success="state == 'accepted'">
+                <field name="price"/>
+                <field name="partner_id"/>
+                <field name="property_type_id"/>
+                <field name="status"/>
+                <field name="validity"/>
+                <field name="date_deadline"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_resusers_views.xml b/estate/views/estate_property_resusers_views.xml
new file mode 100644
index 00000000000..f6a051e6236
--- /dev/null
+++ b/estate/views/estate_property_resusers_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="view_users_form_inherit_property_ids" model="ir.ui.view">
+        <field name="name">res.users.form.property.ids</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook" position="inside">
+                <page string="Properties">
+                    <field name="property_ids"/>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>
+
diff --git a/estate/views/estate_property_tags_views.xml b/estate/views/estate_property_tags_views.xml
new file mode 100644
index 00000000000..c015f465225
--- /dev/null
+++ b/estate/views/estate_property_tags_views.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <odoo>
+    <record id="estate_property_tag_action" model="ir.actions.act_window">
+        <field name="name">Property Tags</field>
+        <field name="res_model">estate.property.tag</field>
+        <field name="view_mode">list,form</field>
+    </record>
+     <record id="estate_property_view_tag_form" model="ir.ui.view">
+        <field name="name">estate.property.tag.form</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_view_tag_list" model="ir.ui.view">
+        <field name="name">estate.property.tag.list</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <list editable="bottom"> 
+                <field name="name"/>    
+            </list>
+        </field>
+    </record>
+</odoo>    
\ No newline at end of file
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
new file mode 100644
index 00000000000..b2e4e9442da
--- /dev/null
+++ b/estate/views/estate_property_type_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="estate_property_type_action" model="ir.actions.act_window">
+        <field name="name">Property Types</field>
+        <field name="res_model">estate.property.type</field>
+        <field name="view_mode">list,form</field>
+    </record>
+    <record id="estate_property_type_view_form" model="ir.ui.view">
+        <field name="name">estate.property.type.form</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <form string="Property Types">
+                <div name='button_box' >
+                    <button class="oe_stat_button" type='action' name='%(estate.estate_property_offer_action)d' icon="fa-pencil-square-o">
+                        <field name='offer_count' />
+ Offers </button>
+                </div>
+                <sheet>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+
+                    <notebook>
+                        <page string="Properties">
+                            <field name="property_ids">
+                                <list create="False" edit="False" delete="False">
+                                    <field name="name" />
+                                    <field name="expected_price" />
+                                    <field name="state" />
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="estate_property_type_view_list" model="ir.ui.view">
+        <field name="name">estate.property.type.list</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <list string= "Property Type">
+                <field name="sequence" widget='handle'/>
+                <field name="name"/>
+            </list>
+        </field>
+    </record>
+
+
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
new file mode 100644
index 00000000000..963b901fe42
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="estate_property_action" model="ir.actions.act_window">
+        <field name="name">Properties</field>
+        <field name="res_model">estate.property</field>
+        <field name="view_mode">kanban,list,form</field>
+        <field name ="help" type="html">
+            <div class="o_kanban_view_nocontent_smiling_face">
+                <p>No properties available. Start by creating one!</p>
+            </div>
+        </field>
+        <!-- <field name="search_view_id" ref="estate_property_view_search"/> -->
+    </record>
+    <record id='estate_property_view_kanban' model='ir.ui.view'>
+        <field name='name'>estate.property.kanban</field>
+        <field name='model'>estate.property</field>
+        <field name='arch' type='xml'>
+            <kanban default_group_by="property_type_id" records_draggable='False'>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div>
+                            <b>
+                                <field name="name" />
+                                <field name="state" invisible='True' />
+                            </b>
+                            <div>Expected Price: <field name="expected_price" />
+                            </div>
+                            <div t-if="record.state.raw_value == 'offer_received'"> Best Price: <field name="best_price" />
+                            </div>
+                            <div t-if="record.state.raw_value == 'offer_accepted'"> Selling Price: <field name="selling_price" />
+                            </div>
+                            <field name="tag_ids" widget="many2many_tags" />
+                        </div>
+
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="estate_property_view_list" model="ir.ui.view">
+        <field name="name">estate.property.list</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <list string="Properties" decoration-success="offer_received" decoration-info="offer_accepted" decoration-muted="state == 'sold'">
+
+                <header>
+                    <button name="%(action_add_offer_wizard)d" type="action" string="Add Offer" />
+                </header>
+                <field name="name" string="Title"/>
+                <field name="state"/>
+                <field name="property_type_id" options="{'no_create': True, 'no_edit': True}" required="1" />
+                <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                <field name="postcode"/>
+                <field name="bedrooms"/>
+                <field name="living_area"/>
+                <field name="expected_price"/>
+                <field name="selling_price"/>
+                <field name="date_availability" optional="hide" invisible="1"/>
+
+            </list>
+        </field>
+    </record>
+    <record id="estate_property_view_form" model="ir.ui.view">
+        <field name="name">estate.property.form</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <form string="Property">
+                <header>
+                    <button name="action_cancel" type="object" string="Cancel" class="btn btn-secondary" invisible="state != 'sold'"/>
+                    <button name="action_sold" type="object" string="Sold" class="btn btn-primary" invisible="state in('sold', 'cancelled')"/>
+                    <field name="state" widget="statusbar" options="{'clickable': False}" />
+                </header>
+                <sheet>
+                    <h1>
+                        <field name="name" />
+                        <field name="state" invisible="1"/>
+                    </h1>
+                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                    <group>
+                        <group>
+                            <field name="property_type_id" options="{'no_create': True, 'no_edit': True}" required="1" />
+                            <field name ="expected_price"/>
+                            <field name="selling_price"/>
+                        </group>
+                        <group>
+                            <field name="postcode"/>
+                            <field name="date_availability" string="Available From"/>
+                            <field name="best_offers" string="Best Offers"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Description">
+                            <group>
+                                <field name="description" string="Description"/>
+                                <field name="bedrooms" string="Bedrooms"/>
+                                <field name="living_area" string="Living Area(sqm)"/>
+                                <field name="facades" string="Facades"/>
+                                <field name="garage" string="Garage"/>
+                                <field name="garden" string="Garden" widget="boolean_toggle"/>
+                                <field name="garden_area" string="Garden Area(sqm)" invisible="not garden"/>
+                                <field name="garden_orientation" string="Garden Orientation" invisible="not garden"/>
+                                <field name="total_area" string="Total Area(sqm)"/>
+                            </group>
+                        </page>
+                        <page string="Other info">
+                            <group>
+                                <field name="seller_id"/>
+                                <field name ="buyer_id"/>
+                            </group>
+                        </page>
+                        <page string="Offers">
+                            <field name="offer_ids" readonly="state in ('offer_accepted', 'sold', 'canceled')">
+                                <list string="property_offers" editable="bottom">
+                                    <field name="price"></field>
+                                    <field name="partner_id"></field>
+                                    <field name="validity"></field>
+                                    <field name="date_deadline"></field>
+                                    <button name="action_offer_accepted" type="object" icon="fa-check" string="Accept Offer" invisible="state != 'new'" />
+                                    <button name="action_offer_refused" type="object" icon="fa-times" string="Refuse Offer" invisible="state != 'new'" />
+                                    <field name="status"></field>
+                                </list>
+                            </field>
+                        </page>
+
+                        <page>
+                            <field name="description"/>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+    <record id="estate_property_view_search" model="ir.ui.view">
+        <field name="name">estate.property.search</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <search string="Search Properties">
+                <field name="name"/>
+                <field name="postcode"/>
+                <filter name="available" string="Available" domain="[('state', '=', 'new')]" context="{'default_selected': True}"/>
+                <group expand="1" string="Group By">
+                    <filter name="group_by_postcode" string="Postcode" context="{'group_by': 'postcode'}"/>
+                    <filter name="filter_living_area" string="Living Area" domain="[('living_area', '>=', self)]" context="{'group_by': 'living_area'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/wizard/__init__.py b/estate/wizard/__init__.py
new file mode 100644
index 00000000000..78122fb9f31
--- /dev/null
+++ b/estate/wizard/__init__.py
@@ -0,0 +1 @@
+from . import estate_property_offer_wizard
\ No newline at end of file
diff --git a/estate/wizard/estate_property_offer_wizard.py b/estate/wizard/estate_property_offer_wizard.py
new file mode 100644
index 00000000000..216fd6ac110
--- /dev/null
+++ b/estate/wizard/estate_property_offer_wizard.py
@@ -0,0 +1,29 @@
+from odoo import models, fields
+
+
+class EstatePropertyOfferWizard(models.TransientModel):
+    _name = "estate.property.offer.wizard"
+    _description = "wizard to add multiple offers"
+
+    price = fields.Float(required=True)
+    partner_id = fields.Many2one("res.partner")
+    validity = fields.Integer(default=7)
+
+    def action_add_offers(self):
+        property_ids = self.env.context.get("active_ids", [])
+        
+        offer_vals_list = []
+        for property_id in property_ids:
+            offer_vals = {
+                "property_id": property_id,
+                "price": self.price,
+                "partner_id": self.partner_id.id,
+                "validity": self.validity,
+            }
+            offer_vals_list.append(offer_vals)
+        
+
+        if len(offer_vals_list) > 0:
+            self.env["estate.property.offer"].create(offer_vals_list)
+
+        return {"type": "ir.actions.act_window_close"}
\ No newline at end of file
diff --git a/estate/wizard/estate_property_offer_wizard_views.xml b/estate/wizard/estate_property_offer_wizard_views.xml
new file mode 100644
index 00000000000..b277b475a88
--- /dev/null
+++ b/estate/wizard/estate_property_offer_wizard_views.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_add_offer_wizard" model="ir.ui.view">
+            <field name="name">add.offer.wizard.form</field>
+            <field name="model">estate.property.offer.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Add Offer">
+                    <sheet>
+                        <group>
+                            <field name="price" />
+                            <field name="partner_id" />
+                            <field name="validity" />
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button string="Confirm" name="action_add_offers" type="object"
+                                class="btn-primary" default_focus="1" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    
+        <record id="action_add_offer_wizard" model="ir.actions.act_window">
+            <field name="name">Add Offer</field>
+            <field name="res_model">estate.property.offer.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_add_offer_wizard" />
+            <field name="context">{'default_property_ids': active_ids}</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
+
+
diff --git a/estate_account/__init__.py b/estate_account/__init__.py
new file mode 100644
index 00000000000..75aa8a6ce33
--- /dev/null
+++ b/estate_account/__init__.py
@@ -0,0 +1 @@
+from .import models
\ No newline at end of file
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
new file mode 100644
index 00000000000..8d36d2af268
--- /dev/null
+++ b/estate_account/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    'name': 'Estate Account',
+    'version': '1.0',
+    'category': 'Estate/Brokerage',
+    'summary': 'Link module between Estate and Account',
+    'description': 'This module links the Estate and Account modules for financial integration.',
+    'depends': ['estate', 'account' ,'mail',
+    'spreadsheet_edition',],
+    'data': [
+        'report/estate_account_templates.xml'
+    ],
+    'installable': True,
+    'application': True,
+    'license': 'LGPL-3',
+}
diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py
new file mode 100644
index 00000000000..5e1963c9d2f
--- /dev/null
+++ b/estate_account/models/__init__.py
@@ -0,0 +1 @@
+from . import estate_property
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
new file mode 100644
index 00000000000..f4980f6d8ff
--- /dev/null
+++ b/estate_account/models/estate_property.py
@@ -0,0 +1,25 @@
+from odoo import models, fields, api, Command
+
+class EstateProperty(models.Model):
+    _inherit = 'estate.property' 
+
+    def action_sold(self):
+        for record in self:
+            record.user_id.check_access("create")
+            self.env['account.move'].sudo().create({
+                'partner_id': record.partner_id.id,
+                'move_type': 'out_invoice',
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': record.name,
+                        'quantity': 1,
+                        'price_unit':record.selling_price
+                    }),
+                    Command.create({
+                        'name': 'Administrative Taxes',
+                        'quantity': 1,
+                        'price_unit': .06 * record.selling_price if .06 * record.selling_price < 100 else 100
+                    })
+                ]})
+            return super(EstateProperty, self).action_sold()
+        
diff --git a/estate_account/report/estate_account_templates.xml b/estate_account/report/estate_account_templates.xml
new file mode 100644
index 00000000000..cf93307a96a
--- /dev/null
+++ b/estate_account/report/estate_account_templates.xml
@@ -0,0 +1,9 @@
+<odoo>
+    <template id="report_estate_property_invoice" inherit_id="estate.report_property_offers">
+        <xpath expr="//div[@id='status']" position="inside">
+            <t t-if="doc.state=='sold'">
+                <strong>!!! Invoice has already been created !!!</strong>
+            </t>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/warranty/__init__.py b/warranty/__init__.py
new file mode 100644
index 00000000000..f9a70a3a7e4
--- /dev/null
+++ b/warranty/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from. import wizard
diff --git a/warranty/__manifest__.py b/warranty/__manifest__.py
new file mode 100644
index 00000000000..f8e241d80a0
--- /dev/null
+++ b/warranty/__manifest__.py
@@ -0,0 +1,19 @@
+{
+    "name": "warranty",
+    "version" : "1.0",
+    "category" : "Sales",
+   
+    "website": "https://www.odoo.com",
+    "depends": ["base","sale_management","spreadsheet"],
+    "data" : [
+      "security/ir.model.access.csv",
+      "wizard/product_warranty_wizard_views.xml",
+      "views/product_templates_views.xml",
+      "views/product_warranty_views.xml",
+      "views/sale_order_views.xml",
+      "views/product_warranty_menus.xml",
+          ],
+    "installable": True,
+    "application": True,
+    "license": "LGPL-3",
+}    
\ No newline at end of file
diff --git a/warranty/models/__init__.py b/warranty/models/__init__.py
new file mode 100644
index 00000000000..42f968f1786
--- /dev/null
+++ b/warranty/models/__init__.py
@@ -0,0 +1,4 @@
+from . import product_warranty
+from . import product_templates
+from . import sale_order
+from . import sale_order_line
\ No newline at end of file
diff --git a/warranty/models/product_templates.py b/warranty/models/product_templates.py
new file mode 100644
index 00000000000..83980045593
--- /dev/null
+++ b/warranty/models/product_templates.py
@@ -0,0 +1,8 @@
+from odoo import models, fields
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    warranty_id = fields.Boolean(default=False)
+
+
+
diff --git a/warranty/models/product_warranty.py b/warranty/models/product_warranty.py
new file mode 100644
index 00000000000..565eaccba74
--- /dev/null
+++ b/warranty/models/product_warranty.py
@@ -0,0 +1,12 @@
+from odoo import models, fields
+
+class WarrantyConfiguration(models.Model):
+    _name = 'warranty.configuration'
+    _description = 'Warranty Configuration'
+
+    name = fields.Char(string="Name",required=True)
+    product_id= fields.Many2one('product.product',string="Product",required=True)
+    percentage= fields.Float(string="Percentage",required=True)
+    year= fields.Integer(string="Duration",required=True)
+
+    
\ No newline at end of file
diff --git a/warranty/models/sale_order.py b/warranty/models/sale_order.py
new file mode 100644
index 00000000000..3efef12249b
--- /dev/null
+++ b/warranty/models/sale_order.py
@@ -0,0 +1,23 @@
+from odoo import models, fields
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+has_warranty = fields.Boolean(string="Has Warranty", store=True)
+def open_warranty_wizard(self):
+        order_lines_with_warranty = self.order_line.filtered(lambda line: line.product_id.warranty and not line.warranty_line_ids)
+
+        wizard = self.env['product.warranty.wizard'].create({
+            'product_ids': [(0, 0, {
+                'product_id': line.product_id.id,
+                'main_order_line': line.id
+            }) for line in order_lines_with_warranty]
+        })
+
+        return {
+            'name': 'Warranty Wizard',
+            'view_mode': 'form',
+            'res_model': 'product.warranty.wizard',
+            'res_id': wizard.id,
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
\ No newline at end of file
diff --git a/warranty/models/sale_order_line.py b/warranty/models/sale_order_line.py
new file mode 100644
index 00000000000..8ccacc740aa
--- /dev/null
+++ b/warranty/models/sale_order_line.py
@@ -0,0 +1,21 @@
+from odoo import models, fields
+class SaleOrderLine(models.Model):
+    _inherit = 'sale.order.line'
+
+
+    warranty_line_id = fields.Many2one(
+        string="Warranty Line",
+        comodel_name="sale.order.line",
+        ondelete="cascade",
+        domain="[('order_id', '=', order_id)]",
+        copy=False,
+        index=True,
+    )
+    warranty_line_ids = fields.One2many(
+        string="Warranty Lines",
+        comodel_name="sale.order.line",
+        inverse_name="warranty_line_id",
+    )
+
+
+
diff --git a/warranty/security/ir.model.access.csv b/warranty/security/ir.model.access.csv
new file mode 100644
index 00000000000..990dc18d89a
--- /dev/null
+++ b/warranty/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+warranty.access_warranty_configuration,access_warranty_configuration,warranty.model_warranty_configuration,base.group_user,1,1,1,1
+warranty.access_product_warranty_wizard,access_product_warranty_wizard,warranty.model_product_warranty_wizard,base.group_user,1,1,1,1
+warranty.access_product_warranty_list,access_product_warranty_list,warranty.model_product_warranty_list,base.group_user,1,1,1,1
diff --git a/warranty/views/product_templates_views.xml b/warranty/views/product_templates_views.xml
new file mode 100644
index 00000000000..f0822310680
--- /dev/null
+++ b/warranty/views/product_templates_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="warranty_inherit_product_template_form_view" model="ir.ui.view">
+        <field name="name">product.product.form.inherit</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='extra_info']" position="inside">
+                    <field name="warranty_id" string="Is Warranty Available?"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/warranty/views/product_warranty_menus.xml b/warranty/views/product_warranty_menus.xml
new file mode 100644
index 00000000000..356083c7584
--- /dev/null
+++ b/warranty/views/product_warranty_menus.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+     <menuitem id="warranty_config_menu" name="Warranty Configuration" parent="sale.menu_sale_config" action="warranty_configuration_action"/>  
+</odoo>
\ No newline at end of file
diff --git a/warranty/views/product_warranty_views.xml b/warranty/views/product_warranty_views.xml
new file mode 100644
index 00000000000..32029cac2df
--- /dev/null
+++ b/warranty/views/product_warranty_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="warranty_configuration_action" model="ir.actions.act_window">
+        <field name="name">Warranty Configuration</field>
+        <field name="res_model">warranty.configuration</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <record id="warranty_configuration_view_list" model="ir.ui.view">
+        <field name="name">warranty.configuration.list</field>
+        <field name="model">warranty.configuration</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name"/>
+                <field name="product_id"/>
+                <field name="percentage"/>
+            </list>
+        </field>
+    </record>
+
+</odoo>
diff --git a/warranty/views/sale_order_views.xml b/warranty/views/sale_order_views.xml
new file mode 100644
index 00000000000..5d83c8581d5
--- /dev/null
+++ b/warranty/views/sale_order_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_order_form" model="ir.ui.view">
+        <field name="name">sale.order.form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_open_discount_wizard']" position="before">
+                  <button string="Add Warranty" name="%(open_warranty_configuration_wizard_action)d" type="action" class="btn btn-secondary"/>  -->
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/warranty/wizard/__init__.py b/warranty/wizard/__init__.py
new file mode 100644
index 00000000000..d0ca7c26a80
--- /dev/null
+++ b/warranty/wizard/__init__.py
@@ -0,0 +1 @@
+from . import product_warranty_wizard
\ No newline at end of file
diff --git a/warranty/wizard/product_warranty_wizard.py b/warranty/wizard/product_warranty_wizard.py
new file mode 100644
index 00000000000..7f86080e94f
--- /dev/null
+++ b/warranty/wizard/product_warranty_wizard.py
@@ -0,0 +1,40 @@
+from odoo import models, fields, api
+from datetime import timedelta, datetime
+
+
+class ProductWarrantyWizard(models.TransientModel):
+    _name = "product.warranty.wizard"
+    _description = "wizard to add multiple offers"
+
+    product_ids = fields.One2many('product.warranty.list', "product_ids", string="warranty Lines") 
+   
+    def add_warranty(self):
+        for record in self.product_ids:
+            self.env['sale.order.line'].create({
+                'product_id': record.year.product_id.id,
+                'product_uom_qty': 1,
+                'order_id': self._context.get('active_id'),
+                'price_unit': record.product_id.list_price * record.year.percentage / 100,
+                'warranty_line_id' :record.main_order_line.id,
+                'name': "Extended Warranty for " + str(record.main_order_line.name) + " End Date: " + str(record.end_date or "N/A")
+
+
+            })
+             
+
+class ProductWarrantyList(models.TransientModel):
+    _name= "product.warranty.list"
+    _description="add warranty list"
+
+    product_ids= fields.Many2one("product.warranty.wizard", string="warranty Lines") 
+    product_id = fields.Many2one('product.product',string="Product",required=True)
+    year= fields.Many2one("warranty.configuration",string="Warranty Years",required= True, default=lambda self: self.env['warranty.configuration'].search([], limit=1))
+    end_date= fields.Date(string="End Date", compute="_compute_end_date",store=True)
+    warranty_line_id = fields.Many2one('sale.order.line' , string=" Warranty Line")
+    main_order_line = fields.Many2one('sale.order.line', string="Order Line")
+
+    @api.depends('year')
+    def _compute_end_date(self):
+        for record in self:
+            if record.year:
+                record.end_date= datetime.now() + timedelta(days=record.year.year*365)
\ No newline at end of file
diff --git a/warranty/wizard/product_warranty_wizard_views.xml b/warranty/wizard/product_warranty_wizard_views.xml
new file mode 100644
index 00000000000..64edc7fca06
--- /dev/null
+++ b/warranty/wizard/product_warranty_wizard_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="warranty_configuration_wizard_view" model="ir.ui.view">
+            <field name="name">product.warranty.wizard.form</field>
+            <field name="model">product.warranty.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Add Warranty">
+                    <sheet>
+                        <field name="product_ids">
+                            <list editable="bottom">
+                                <field name="product_id" />
+                                <field name="year" />
+                                <field name="end_date" />
+                            </list>
+                        </field>
+                    </sheet>
+                    <footer>
+                        <button string="Add" name="add_warranty" type="object" class="btn-primary" default_focus="1" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id = "open_warranty_configuration_wizard_action" model="ir.actions.act_window">
+            <field name="name"> Add Warranty</field>
+            <field name="res_model">product.warranty.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+
+        </record>
+    </data>
+</odoo>