diff --git a/odoo-bringout-odoomates-om_account_budget/om_account_budget/models/account_budget.py b/odoo-bringout-odoomates-om_account_budget/om_account_budget/models/account_budget.py
index 43fedfc..6e1f183 100644
--- a/odoo-bringout-odoomates-om_account_budget/om_account_budget/models/account_budget.py
+++ b/odoo-bringout-odoomates-om_account_budget/om_account_budget/models/account_budget.py
@@ -42,10 +42,10 @@ class CrossoveredBudget(models.Model):
     _description = "Budget"
     _inherit = ['mail.thread']
 
-    name = fields.Char('Budget Name', required=True, states={'done': [('readonly', True)]})
+    name = fields.Char('Budget Name', required=True)
     user_id = fields.Many2one('res.users', 'Responsible', default=lambda self: self.env.user)
-    date_from = fields.Date('Start Date', required=True, states={'done': [('readonly', True)]})
-    date_to = fields.Date('End Date', required=True, states={'done': [('readonly', True)]})
+    date_from = fields.Date('Start Date', required=True)
+    date_to = fields.Date('End Date', required=True)
     state = fields.Selection([
         ('draft', 'Draft'),
         ('cancel', 'Cancelled'),
@@ -54,7 +54,7 @@ class CrossoveredBudget(models.Model):
         ('done', 'Done')
         ], 'Status', default='draft', index=True, required=True, readonly=True, copy=False, tracking=True)
     crossovered_budget_line = fields.One2many('crossovered.budget.lines', 'crossovered_budget_id', 'Budget Lines',
-        states={'done': [('readonly', True)]}, copy=True)
+        copy=True)
     company_id = fields.Many2one('res.company', 'Company', required=True, default=lambda self: self.env.company)
 
     def action_budget_confirm(self):
@@ -80,7 +80,7 @@ class CrossoveredBudgetLines(models.Model):
     name = fields.Char(compute='_compute_line_name')
     crossovered_budget_id = fields.Many2one('crossovered.budget', 'Budget', ondelete='cascade', index=True, required=True)
     analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account')
-    analytic_plan_id = fields.Many2one('account.analytic.group', 'Analytic Plan', related='analytic_account_id.plan_id', readonly=True)
+    analytic_plan_id = fields.Many2one('account.analytic.plan', 'Analytic Plan', related='analytic_account_id.plan_id', readonly=True)
     general_budget_id = fields.Many2one('account.budget.post', 'Budgetary Position')
     date_from = fields.Date('Start Date', required=True)
     date_to = fields.Date('End Date', required=True)
diff --git a/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/account_budget_views.xml b/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/account_budget_views.xml
index ba9511d..8303f85 100644
--- a/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/account_budget_views.xml
+++ b/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/account_budget_views.xml
@@ -33,7 +33,7 @@
 
     <menuitem id="menu_budget_post_form"
               action="open_budget_post_form"
-              parent="account.account_management_menu"
+              parent="account.account_account_menu"
               sequence="5"/>
 
     <record id="view_budget_post_form" model="ir.ui.view">
@@ -247,7 +247,7 @@
     </record>
 
     <menuitem id="menu_act_crossovered_budget_view"
-              parent="account.menu_finance_entries_management"
+              parent="account.menu_finance_entries"
               name="Budgets"
               action="act_crossovered_budget_view"
               sequence="60"
@@ -262,10 +262,9 @@
                 <field name="crossovered_budget_id"/>
                 <filter name="filter_not_cancelled" string="Not Cancelled"
                         domain="[('crossovered_budget_state','!=','cancel')]"/>
-                <group expand="0" string="Group By">
-                    <filter name="group_crossevered_budgdet_id" string="Budgets"
-                            domain="[]" context="{'group_by':'crossovered_budget_id'}"/>
-                </group>
+                <separator/>
+                <filter name="group_crossevered_budgdet_id" string="Budgets"
+                        context="{'group_by':'crossovered_budget_id'}"/>
             </search>
         </field>
     </record>
diff --git a/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/res_config_settings_views.xml b/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/res_config_settings_views.xml
index c7100c2..840eea7 100644
--- a/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/res_config_settings_views.xml
+++ b/odoo-bringout-odoomates-om_account_budget/om_account_budget/views/res_config_settings_views.xml
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-    <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field name="name">res.config.settings.view.form.inherit.account.budget</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@id='account_budget']" position="replace"/>
-        </field>
-    </record>
-
+    <!-- account_budget div removed in 19.0, no settings override needed -->
 </odoo>