From f11a8e67091c3fc6b6b70d75a4d0ef8a4d3ea795 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 23 Apr 2023 17:11:03 +0200 Subject: [PATCH] #32 --- models/donation_tax_receipt.py | 4 ++-- models/partner.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/models/donation_tax_receipt.py b/models/donation_tax_receipt.py index 31d3249..9006296 100644 --- a/models/donation_tax_receipt.py +++ b/models/donation_tax_receipt.py @@ -32,8 +32,8 @@ class DonationTaxReceipt(models.Model): html_content_print=html_content_print.replace('{{date}}',today.strftime("%d %B %Y")) html_content_print=html_content_print.replace('{{donor_id}}',str(self.partner_id.donor_id)) html_content_print=html_content_print.replace('{{fiscalyear}}',str(int(today.strftime("%Y"))-1)) - html_content_print=html_content_print.replace('{{amount}}',str(res.amount)) - html_content_print=html_content_print.replace('{{amountstr}}',num2words(float(res.amount),lang="fr",to="currency")) + html_content_print=html_content_print.replace('{{amount}}',str(round(res.amount,0))) + html_content_print=html_content_print.replace('{{amountstr}}',num2words(round(float(res.amount),0),lang="fr",to="currency")) res.html_content_print=html_content_print res.template_rf_id=template_rf.id diff --git a/models/partner.py b/models/partner.py index d53654f..0e415dc 100644 --- a/models/partner.py +++ b/models/partner.py @@ -260,6 +260,10 @@ class partner(models.Model): @api.onchange('zip') def _onchange_zip(self): if self.zip: - if len(self.zip)!=5: raise ValidationError('invalid zip code') - if not self.zip.isnumeric(): raise ValidationError('invalid zip code') + if self.country_id.name=='France': + if len(self.zip)!=5: raise ValidationError('invalid zip code') + if not self.zip.isnumeric(): raise ValidationError('invalid zip code') + else: + if len(self.zip)>10: raise ValidationError('invalid zip code') + return \ No newline at end of file