diff --git a/base_accounting_kit/__manifest__.py b/base_accounting_kit/__manifest__.py index d96f89944..a639b6dde 100644 --- a/base_accounting_kit/__manifest__.py +++ b/base_accounting_kit/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Odoo 14 Full Accounting Kit', - 'version': '14.0.2.5.5', + 'version': '14.0.2.6.5', 'category': 'Accounting', 'live_test_url': 'https://www.youtube.com/watch?v=peAp2Tx_XIs', 'summary': """ Asset and Budget Management, diff --git a/base_accounting_kit/views/followup_report.xml b/base_accounting_kit/views/followup_report.xml index bb4794ebb..51d9c6ecb 100644 --- a/base_accounting_kit/views/followup_report.xml +++ b/base_accounting_kit/views/followup_report.xml @@ -9,6 +9,16 @@
+

diff --git a/employee_documents_expiry/__manifest__.py b/employee_documents_expiry/__manifest__.py index f438b8e1f..5a424c7cb 100644 --- a/employee_documents_expiry/__manifest__.py +++ b/employee_documents_expiry/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Employee Documents', - 'version': '14.0.1.0.0', + 'version': '14.0.1.1.1', 'summary': """Manages Employee Documents With Expiry Notifications.""", 'description': """Manages Employee Related Documents with Expiry Notifications.""", 'category': 'Generic Modules/Human Resources', diff --git a/employee_documents_expiry/doc/RELEASE_NOTES.md b/employee_documents_expiry/doc/RELEASE_NOTES.md index 67f3e0cc2..8d3d39c3c 100644 --- a/employee_documents_expiry/doc/RELEASE_NOTES.md +++ b/employee_documents_expiry/doc/RELEASE_NOTES.md @@ -6,4 +6,10 @@ Initial commit for Employee Documents Expiry +#### 09.03.2021 +#### Version 14.0.1.1.1 +#### FIX +Bug Fixedss + + diff --git a/employee_documents_expiry/models/employee_documents.py b/employee_documents_expiry/models/employee_documents.py index 93b87b672..d119eb607 100644 --- a/employee_documents_expiry/models/employee_documents.py +++ b/employee_documents_expiry/models/employee_documents.py @@ -21,8 +21,8 @@ ############################################################################# from datetime import datetime, date, timedelta + from odoo import models, fields, api, _ -from odoo.exceptions import Warning class HrEmployeeDocument(models.Model): @@ -47,18 +47,23 @@ class HrEmployeeDocument(models.Model): } self.env['mail.mail'].create(main_content).send() - @api.constrains('expiry_date') + @api.onchange('expiry_date') def check_expr_date(self): for each in self: exp_date = each.expiry_date - if exp_date < date.today(): - raise Warning('Your Document Is Already Expired.') + if exp_date and exp_date < date.today(): + return { + 'warning': { + 'title': _('Document Expired.'), + 'message': _("Your Document Is Already Expired.") + } + } name = fields.Char(string='Document Number', required=True, copy=False) document_name = fields.Many2one('employee.checklist', string='Document', required=True) description = fields.Text(string='Description', copy=False) expiry_date = fields.Date(string='Expiry Date', copy=False) - employee_ref = fields.Many2one('hr.employee', invisible=1, copy=False) + employee_ref = fields.Many2one('hr.employee', copy=False) doc_attachment_id = fields.Many2many('ir.attachment', 'doc_attach_rel', 'doc_id', 'attach_id3', string="Attachment", help='You can attach the copy of your document', copy=False) issue_date = fields.Date(string='Issue Date', default=fields.Date.context_today, copy=False) diff --git a/employee_documents_expiry/views/employee_document_view.xml b/employee_documents_expiry/views/employee_document_view.xml index 5b0dc0cec..8c1d65b25 100644 --- a/employee_documents_expiry/views/employee_document_view.xml +++ b/employee_documents_expiry/views/employee_document_view.xml @@ -22,7 +22,7 @@ - +