From e5f939205f380eb3f15c1e78403271a1d85407d7 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 7 Oct 2014 21:07:34 +0200 Subject: [PATCH 1/2] Port to v8 and to new API --- .../__init__.py | 2 +- .../__openerp__.py | 5 ++- .../account_journal.py | 33 +++++++----------- .../account_journal_always_check_date.pot | 0 .../i18n/fr.po | 0 .../i18n/pt_BR.po | 0 .../always_check_date_constraint.jpg | Bin .../static/description}/icon.png | Bin 8 files changed, 15 insertions(+), 25 deletions(-) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/__init__.py (94%) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/__openerp__.py (93%) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/account_journal.py (63%) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/i18n/account_journal_always_check_date.pot (100%) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/i18n/fr.po (100%) rename {__unported__/account_journal_always_check_date => account_journal_always_check_date}/i18n/pt_BR.po (100%) rename {__unported__/account_journal_always_check_date/images => account_journal_always_check_date/static/description}/always_check_date_constraint.jpg (100%) rename {__unported__/account_journal_always_check_date/static/src/img => account_journal_always_check_date/static/description}/icon.png (100%) diff --git a/__unported__/account_journal_always_check_date/__init__.py b/account_journal_always_check_date/__init__.py similarity index 94% rename from __unported__/account_journal_always_check_date/__init__.py rename to account_journal_always_check_date/__init__.py index 841a1a350..1d8ff4ade 100644 --- a/__unported__/account_journal_always_check_date/__init__.py +++ b/account_journal_always_check_date/__init__.py @@ -2,7 +2,7 @@ ############################################################################## # # Account Journal Always Check Date module for OpenERP -# Copyright (C) 2013 Akretion (http://www.akretion.com) +# Copyright (C) 2013-2014 Akretion (http://www.akretion.com) # @author Alexis de Lattre # # This program is free software: you can redistribute it and/or modify diff --git a/__unported__/account_journal_always_check_date/__openerp__.py b/account_journal_always_check_date/__openerp__.py similarity index 93% rename from __unported__/account_journal_always_check_date/__openerp__.py rename to account_journal_always_check_date/__openerp__.py index b4d131dfc..18c2ed53d 100644 --- a/__unported__/account_journal_always_check_date/__openerp__.py +++ b/account_journal_always_check_date/__openerp__.py @@ -2,7 +2,7 @@ ############################################################################## # # Account Journal Always Check Date module for OpenERP -# Copyright (C) 2013 Akretion (http://www.akretion.com) +# Copyright (C) 2013-2014 Akretion (http://www.akretion.com) # @author Alexis de Lattre # # This program is free software: you can redistribute it and/or modify @@ -49,7 +49,6 @@ for any help or question about this module. 'website': 'http://www.akretion.com', 'depends': ['account'], 'data': [], - 'images': ['images/always_check_date_constraint.jpg'], - 'installable': False, + 'installable': True, 'active': False, } diff --git a/__unported__/account_journal_always_check_date/account_journal.py b/account_journal_always_check_date/account_journal.py similarity index 63% rename from __unported__/account_journal_always_check_date/account_journal.py rename to account_journal_always_check_date/account_journal.py index 15361a163..70f756647 100644 --- a/__unported__/account_journal_always_check_date/account_journal.py +++ b/account_journal_always_check_date/account_journal.py @@ -2,7 +2,7 @@ ############################################################################## # # Account Journal Always Check Date module for OpenERP -# Copyright (C) 2013 Akretion (http://www.akretion.com) +# Copyright (C) 2013-2014 Akretion (http://www.akretion.com) # @author Alexis de Lattre # # This program is free software: you can redistribute it and/or modify @@ -20,13 +20,13 @@ # ############################################################################## -from openerp.osv import orm -from openerp.tools.translate import _ +from openerp import models, fields, api, _ -class account_journal(orm.Model): +class account_journal(models.Model): _inherit = 'account.journal' + @api.v7 def init(self, cr): '''Activate 'Check Date in Period' on all existing journals''' cr.execute( @@ -34,21 +34,12 @@ class account_journal(orm.Model): "WHERE allow_date <> true") return True - _defaults = { - 'allow_date': True, - } + allow_date = fields.Boolean(default=True) - def _allow_date_always_active(self, cr, uid, ids): - for journal in self.browse(cr, uid, ids): - if not journal.allow_date: - raise orm.except_orm( - _('Error:'), - _("The option 'Check Date in Period' must be active " - "on journal '%s'.") - % journal.name - ) - return True - - _constraints = [ - (_allow_date_always_active, "Error msg in raise", ['allow_date']), - ] + @api.one + @api.constrains('allow_date') + def _allow_date_always_active(self): + if not self.allow_date: + raise Warning( + _("The option 'Check Date in Period' must be active " + "on journal '%s'.") % self.name) diff --git a/__unported__/account_journal_always_check_date/i18n/account_journal_always_check_date.pot b/account_journal_always_check_date/i18n/account_journal_always_check_date.pot similarity index 100% rename from __unported__/account_journal_always_check_date/i18n/account_journal_always_check_date.pot rename to account_journal_always_check_date/i18n/account_journal_always_check_date.pot diff --git a/__unported__/account_journal_always_check_date/i18n/fr.po b/account_journal_always_check_date/i18n/fr.po similarity index 100% rename from __unported__/account_journal_always_check_date/i18n/fr.po rename to account_journal_always_check_date/i18n/fr.po diff --git a/__unported__/account_journal_always_check_date/i18n/pt_BR.po b/account_journal_always_check_date/i18n/pt_BR.po similarity index 100% rename from __unported__/account_journal_always_check_date/i18n/pt_BR.po rename to account_journal_always_check_date/i18n/pt_BR.po diff --git a/__unported__/account_journal_always_check_date/images/always_check_date_constraint.jpg b/account_journal_always_check_date/static/description/always_check_date_constraint.jpg similarity index 100% rename from __unported__/account_journal_always_check_date/images/always_check_date_constraint.jpg rename to account_journal_always_check_date/static/description/always_check_date_constraint.jpg diff --git a/__unported__/account_journal_always_check_date/static/src/img/icon.png b/account_journal_always_check_date/static/description/icon.png similarity index 100% rename from __unported__/account_journal_always_check_date/static/src/img/icon.png rename to account_journal_always_check_date/static/description/icon.png From 583c3da5af3cd9e248018fe685477c80059e0d0d Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 7 Oct 2014 21:10:12 +0200 Subject: [PATCH 2/2] FIX typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1792f9547..f7fa6c2b1 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ It provides addons to: - Force draft accounting by default - Enforce partners on account moves -And munch more. +And much more.