diff --git a/base_usability/models/__init__.py b/base_usability/models/__init__.py index d522841..c4d8b8b 100644 --- a/base_usability/models/__init__.py +++ b/base_usability/models/__init__.py @@ -3,4 +3,3 @@ from . import partner from . import company from . import mail from . import misc -from . import report_sxw diff --git a/base_usability/models/misc.py b/base_usability/models/misc.py index 11ef333..53c1968 100644 --- a/base_usability/models/misc.py +++ b/base_usability/models/misc.py @@ -1,7 +1,9 @@ # © 2015-2016 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import models, fields, api +from odoo.tools import misc +from odoo.tools import float_compare class BaseLanguageExport(models.TransientModel): @@ -15,3 +17,32 @@ class BaseLanguageInstall(models.TransientModel): _inherit = 'base.language.install' overwrite = fields.Boolean(default=True) + + +class BaseUsabilityInstalled(models.AbstractModel): + _name = "base.usability.installed" + _description = "technical flag to see if base_usability module is installed" + + +formatLang_original = misc.formatLang + +def formatLang(self, value, digits=None, grouping=True, monetary=False, + dp=False, currency_obj=False, int_no_digits=True): + with api.Environment.manage(): + env = api.Environment(self.cr, self.uid, {}) + if ( + 'base.usability.installed' in env and + int_no_digits and + not monetary and + isinstance(value, float) and + dp): + prec = env['decimal.precision'].precision_get(dp) + if not float_compare(value, int(value), precision_digits=prec): + digits = 0 + dp = False + res = formatLang_original( + self, value, digits=digits, grouping=grouping, monetary=monetary, + dp=dp, currency_obj=currency_obj) + return res + +misc.formatLang = formatLang diff --git a/base_usability/models/report_sxw.py b/base_usability/models/report_sxw.py deleted file mode 100644 index 64e2bd1..0000000 --- a/base_usability/models/report_sxw.py +++ /dev/null @@ -1,35 +0,0 @@ -# © 2016 Akretion (Alexis de Lattre ) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import models, api -from odoo.tools import misc -from odoo.tools import float_compare - - -class BaseUsabilityInstalled(models.AbstractModel): - _name = "base.usability.installed" - - -formatLang_original = misc.formatLang - -def formatLang(self, value, digits=None, grouping=True, monetary=False, - dp=False, currency_obj=False, int_no_digits=True): - with api.Environment.manage(): - env = api.Environment(self.cr, self.uid, {}) - if ( - 'base.usability.installed' in env and - int_no_digits and - not monetary and - isinstance(value, float) and - dp): - prec = env['decimal.precision'].precision_get(dp) - if not float_compare(value, int(value), precision_digits=prec): - digits = 0 - dp = False - res = formatLang_original( - self, value, digits=digits, grouping=grouping, monetary=monetary, - dp=dp, currency_obj=currency_obj) - return res - - -misc.formatLang = formatLang