From 583ba53ca45990047eb497ab4ccb71504cf96aa2 Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Thu, 18 Jul 2024 11:42:56 +0530 Subject: [PATCH] Jul 18 [UPDT] Updated 'base_account_budget' --- base_account_budget/__manifest__.py | 2 +- base_account_budget/doc/RELEASE_NOTES.md | 8 +- .../models/account_analytic_account.py | 3 +- base_account_budget/models/account_budget.py | 98 ++++++++++++------- 4 files changed, 74 insertions(+), 37 deletions(-) diff --git a/base_account_budget/__manifest__.py b/base_account_budget/__manifest__.py index 2d13f6d29..674e6f199 100644 --- a/base_account_budget/__manifest__.py +++ b/base_account_budget/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Odoo 16 Budget Management', - 'version': '16.0.1.0.0', + 'version': '16.0.1.0.1', 'summary': """ Budget Management for Odoo 16 Community Edition. """, 'description': """ This module allows accountants to manage analytic and budgets. diff --git a/base_account_budget/doc/RELEASE_NOTES.md b/base_account_budget/doc/RELEASE_NOTES.md index 27a1eca41..d032caa3e 100644 --- a/base_account_budget/doc/RELEASE_NOTES.md +++ b/base_account_budget/doc/RELEASE_NOTES.md @@ -1,7 +1,13 @@ ## Module #### 06.10.2021 -#### Version 15.0.1.0.0 +#### Version 16.0.1.0.0 #### ADD - Initial commit for base_account_budget +### 18.07.2024 +### Version 16.0.1.0.1 +### UPDT + +- Bug Fix-Fixed the issue when creating a new budget line. + diff --git a/base_account_budget/models/account_analytic_account.py b/base_account_budget/models/account_analytic_account.py index 73625d7e4..ed3010675 100644 --- a/base_account_budget/models/account_analytic_account.py +++ b/base_account_budget/models/account_analytic_account.py @@ -25,4 +25,5 @@ from odoo import fields, models class AccountAnalyticAccount(models.Model): _inherit = "account.analytic.account" - budget_line = fields.One2many('budget.lines', 'analytic_account_id', 'Budget Lines') + budget_line = fields.One2many('budget.lines', 'analytic_account_id', + 'Budget Lines') diff --git a/base_account_budget/models/account_budget.py b/base_account_budget/models/account_budget.py index c0c11252c..0a41bd92b 100644 --- a/base_account_budget/models/account_budget.py +++ b/base_account_budget/models/account_budget.py @@ -19,7 +19,6 @@ # If not, see . # ############################################################################# - from odoo import api, fields, models, _ from odoo.exceptions import ValidationError @@ -30,20 +29,25 @@ class AccountBudgetPost(models.Model): _description = "Budgetary Position" name = fields.Char('Name', required=True) - account_ids = fields.Many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts', + account_ids = fields.Many2many('account.account', 'account_budget_rel', + 'budget_id', 'account_id', 'Accounts', domain=[('deprecated', '=', False)]) - budget_line = fields.One2many('budget.lines', 'general_budget_id', 'Budget Lines') + budget_line = fields.One2many('budget.lines', 'general_budget_id', + 'Budget Lines') company_id = fields.Many2one('res.company', 'Company', required=True, - default=lambda self: self.env['res.company']._company_default_get( + default=lambda self: self.env[ + 'res.company']._company_default_get( 'account.budget.post')) def _check_account_ids(self, vals): - if 'account_ids' in vals: - account_ids = vals['account_ids'] - else: - account_ids = self.account_ids - if not account_ids: - raise ValidationError(_('The budget must have at least one account.')) + for val in vals: + if 'account_ids' in val: + account_ids = val['account_ids'] + else: + account_ids = self.account_ids + if not account_ids: + raise ValidationError( + _('The budget must have at least one account.')) @api.model_create_multi def create(self, vals): @@ -60,21 +64,28 @@ class Budget(models.Model): _description = "Budget" _inherit = ['mail.thread'] - name = fields.Char('Budget Name', required=True, states={'done': [('readonly', True)]}) - creating_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)]}) + name = fields.Char('Budget Name', required=True, + states={'done': [('readonly', True)]}) + creating_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)]}) state = fields.Selection([ ('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'Confirmed'), ('validate', 'Validated'), ('done', 'Done') - ], 'Status', default='draft', index=True, required=True, readonly=True, copy=False) + ], 'Status', default='draft', index=True, required=True, readonly=True, + copy=False) budget_line = fields.One2many('budget.lines', 'budget_id', 'Budget Lines', - states={'done': [('readonly', True)]}, copy=True) + states={'done': [('readonly', True)]}, + copy=True) company_id = fields.Many2one('res.company', 'Company', required=True, - default=lambda self: self.env['res.company']._company_default_get( + default=lambda self: self.env[ + 'res.company']._company_default_get( 'account.budget.post')) def action_budget_confirm(self): @@ -98,17 +109,24 @@ class BudgetLines(models.Model): _rec_name = "budget_id" _description = "Budget Line" - budget_id = fields.Many2one('budget.budget', 'Budget', ondelete='cascade', index=True, required=True) - analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account') - general_budget_id = fields.Many2one('account.budget.post', 'Budgetary Position', required=True) + budget_id = fields.Many2one('budget.budget', 'Budget', ondelete='cascade', + index=True, required=True) + analytic_account_id = fields.Many2one('account.analytic.account', + 'Analytic Account') + general_budget_id = fields.Many2one('account.budget.post', + 'Budgetary Position', required=True) date_from = fields.Date('Start Date', required=True) date_to = fields.Date('End Date', required=True) paid_date = fields.Date('Paid Date') planned_amount = fields.Float('Planned Amount', required=True, digits=0) - practical_amount = fields.Float(compute='_compute_practical_amount', string='Practical Amount', digits=0) - theoretical_amount = fields.Float(compute='_compute_theoretical_amount', string='Theoretical Amount', digits=0) - percentage = fields.Float(compute='_compute_percentage', string='Achievement') - company_id = fields.Many2one(related='budget_id.company_id', comodel_name='res.company', + practical_amount = fields.Float(compute='_compute_practical_amount', + string='Practical Amount', digits=0) + theoretical_amount = fields.Float(compute='_compute_theoretical_amount', + string='Theoretical Amount', digits=0) + percentage = fields.Float(compute='_compute_percentage', + string='Achievement') + company_id = fields.Many2one(related='budget_id.company_id', + comodel_name='res.company', string='Company', store=True, readonly=True) def _compute_practical_amount(self): @@ -116,7 +134,8 @@ class BudgetLines(models.Model): result = 0.0 acc_ids = line.general_budget_id.account_ids.ids date_to = self.env.context.get('wizard_date_to') or line.date_to - date_from = self.env.context.get('wizard_date_from') or line.date_from + date_from = self.env.context.get( + 'wizard_date_from') or line.date_from if line.analytic_account_id.id: self.env.cr.execute(""" SELECT SUM(amount) @@ -124,7 +143,8 @@ class BudgetLines(models.Model): WHERE account_id=%s AND date between %s AND %s AND general_account_id=ANY(%s)""", - (line.analytic_account_id.id, date_from, date_to, acc_ids,)) + (line.analytic_account_id.id, date_from, + date_to, acc_ids,)) result = self.env.cr.fetchone()[0] or 0.0 line.practical_amount = result @@ -133,9 +153,13 @@ class BudgetLines(models.Model): for line in self: # Used for the report - if self.env.context.get('wizard_date_from') and self.env.context.get('wizard_date_to'): - date_from = fields.Datetime.from_string(self.env.context.get('wizard_date_from')) - date_to = fields.Datetime.from_string(self.env.context.get('wizard_date_to')) + if self.env.context.get( + 'wizard_date_from') and self.env.context.get( + 'wizard_date_to'): + date_from = fields.Datetime.from_string( + self.env.context.get('wizard_date_from')) + date_to = fields.Datetime.from_string( + self.env.context.get('wizard_date_to')) if date_from < fields.Datetime.from_string(line.date_from): date_from = fields.Datetime.from_string(line.date_from) elif date_from > fields.Datetime.from_string(line.date_to): @@ -148,7 +172,8 @@ class BudgetLines(models.Model): theo_amt = 0.00 if date_from and date_to: - line_timedelta = fields.Datetime.from_string(line.date_to) - fields.Datetime.from_string( + line_timedelta = fields.Datetime.from_string( + line.date_to) - fields.Datetime.from_string( line.date_from) elapsed_timedelta = date_to - date_from if elapsed_timedelta.days > 0: @@ -156,12 +181,15 @@ class BudgetLines(models.Model): elapsed_timedelta.total_seconds() / line_timedelta.total_seconds()) * line.planned_amount else: if line.paid_date: - if fields.Datetime.from_string(line.date_to) <= fields.Datetime.from_string(line.paid_date): + if fields.Datetime.from_string( + line.date_to) <= fields.Datetime.from_string( + line.paid_date): theo_amt = 0.00 else: theo_amt = line.planned_amount else: - line_timedelta = fields.Datetime.from_string(line.date_to) - fields.Datetime.from_string( + line_timedelta = fields.Datetime.from_string( + line.date_to) - fields.Datetime.from_string( line.date_from) elapsed_timedelta = fields.Datetime.from_string(today) - ( fields.Datetime.from_string(line.date_from)) @@ -169,7 +197,8 @@ class BudgetLines(models.Model): if elapsed_timedelta.days < 0: # If the budget line has not started yet, theoretical amount should be zero theo_amt = 0.00 - elif line_timedelta.days > 0 and fields.Datetime.from_string(today) < fields.Datetime.from_string( + elif line_timedelta.days > 0 and fields.Datetime.from_string( + today) < fields.Datetime.from_string( line.date_to): # If today is between the budget line date_from and date_to theo_amt = ( @@ -182,6 +211,7 @@ class BudgetLines(models.Model): def _compute_percentage(self): for line in self: if line.theoretical_amount != 0.00: - line.percentage = float((line.practical_amount or 0.0) / line.theoretical_amount) * 100 + line.percentage = float(( + line.practical_amount or 0.0) / line.theoretical_amount) * 100 else: line.percentage = 0.00