From 607be79004f704f2f2450578c99e12b2f976b8b0 Mon Sep 17 00:00:00 2001 From: Lionel Sausin Date: Thu, 27 Mar 2014 11:04:12 +0100 Subject: [PATCH] [IMP] visual improvement: set the SIRET to SIREN+'*****' when the NIC is empty. Use the style from v8 to hide the SIRET in edit view, instead of our own custom style --- l10n_fr_siret/partner.py | 10 +++------- l10n_fr_siret/partner_view.xml | 9 ++++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/l10n_fr_siret/partner.py b/l10n_fr_siret/partner.py index 3966d441c..13aac7653 100644 --- a/l10n_fr_siret/partner.py +++ b/l10n_fr_siret/partner.py @@ -41,13 +41,9 @@ class Partner(orm.Model): def _get_siret(self, cr, uid, ids, field_name, arg, context=None): """Concatenate the SIREN and NIC to form the SIRET""" - sirets = {} - for partner in self.browse(cr, uid, ids, context=context): - if partner.siren and partner.nic: - sirets[partner.id] = '%s%s' % (partner.siren, partner.nic) - else: - sirets[partner.id] = '' - return sirets + return {partner.id: '%s%s' % (partner.siren, partner.nic or '*****') + if partner.siren else '' + for partner in self.browse(cr, uid, ids, context=context)} def _check_siret(self, cr, uid, ids): """Check the SIREN's and NIC's keys (last digits)""" diff --git a/l10n_fr_siret/partner_view.xml b/l10n_fr_siret/partner_view.xml index d95f2bc0a..b373bb2b2 100644 --- a/l10n_fr_siret/partner_view.xml +++ b/l10n_fr_siret/partner_view.xml @@ -10,9 +10,12 @@ - - + +