From e60ed4b5fa0c2e376b1fd31d8f101db13d41e50f Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Fri, 2 Sep 2022 15:08:37 +0200 Subject: [PATCH] =?UTF-8?q?Arr=C3=AAt=20critique=20si=20la=20saisi=20du=20?= =?UTF-8?q?d=C3=A9biteur=20est=20=C3=A0=20nouveau=20faux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index c2b03c1..70f5baa 100644 --- a/main.py +++ b/main.py @@ -315,13 +315,17 @@ class ClercAttrib2Biz(): data = json.load(f) if self.export_format_biz.get(): - self.parseFile(data, filename) - messagebox.showinfo(title="Fin de conversion", - message="La conversion s'est terminée avec succès") + bRet = self.parseFile(data, filename) + if bRet: + messagebox.showinfo(title="Fin de conversion", + message="La conversion s'est terminée avec succès") + return False + else: self.convertFile(data, filename) if self.delete_after_parse.get(): os.remove(dir + "/" + filename) + self.progress_bar["value"] = x / len(os.listdir(dir)) * 100 self.fenetre.update_idletasks() self.nb_facture_var.set(self.count_facture) @@ -396,14 +400,12 @@ class ClercAttrib2Biz(): csv_col.data[5] = f"" lines.append(csv_col.data) - x = 0 cur_invoice_index = 0 - for ele in data["invoices"]: - x += 1 + for ele in data["invoices"]: cur_invoice_index += 1 - self.progress_bar["value"] = cur_invoice_index / x * 100 + self.progress_bar["value"] = cur_invoice_index / self.count_facture * 100 b_address_update = True data = cls_Invoice() data.parse_item(ele) @@ -416,9 +418,15 @@ class ClercAttrib2Biz(): messagebox.showerror(title="Erreur code débiteur", message=f"Le code débiteur de la facture {data.data['id']} est faux: [{data.Debtor['code']}], merci de le corriger ") inp_popup = Input_popup(self.fenetre, default=data.Debtor["code"], factureID=data.data['id'], fip=data.Patient['fip_number']) data.Debtor["code"] = str(inp_popup.show()) + if data.Debtor["code"] is None or '.' in data.Debtor["code"]: + messagebox.showerror(title="Erreur Critique", + message=f"Les informations de la factures [{data.data['id']}] comportes trop d'erreur arrêt du processus ") + return False if int(data.Debtor["code"]) == 1: if not self.check_code_validity(data.Debtor["code"],data): + messagebox.showerror(title="Erreur Critique", + message=f"Les informations de la factures [{data.data['id']}] comportes trop d'erreur arrêt du processus ") return False @@ -459,6 +467,9 @@ class ClercAttrib2Biz(): + + + if data.Patient["complement"] != None: self.a_listings["to_check"].append(data.Patient["fip_number"]) print(data.Patient["complement"])