root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfixes/hotfix-thanatoname-in-devis-list' into staging

Browse Source
This commit is contained in:
Tiavina 2024-12-30 16:24:55 +03:00
commit 97f1d2b244
20 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/js/apercusTousDevis.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/apercusToutesFactures.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/article.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/bibliotheque.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/client.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/configuration.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/defunt.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/defuntShow.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/devis.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/devisShow.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/facture.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/factureShow.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/legalnotice.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/lieu.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/produit.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/statistique.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/thanatopracteur.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/trajet.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/trajetdetails.app.js
View File

File diff suppressed because one or more lines are too long

4
gestion/src/js/objects/devis.mjs
View File

@ -26,11 +26,11 @@ export class Devis {
let thanatoPrenom = ""; let thanatoPrenom = "";
let thanatoNom = ""; let thanatoNom = "";
let thanatoFullName = ""; let thanatoFullName = "";
if(myresp.nom_thanato != null || myresp.nom_thanato.length != 0){ if(myresp.nom_thanato != null && myresp.nom_thanato.length != 0){
thanatoNom = myresp.nom_thanato; thanatoNom = myresp.nom_thanato;
thanatoFullName += thanatoNom; thanatoFullName += thanatoNom;
} }
if(myresp.prenom_thanato != null || myresp.prenom_thanato.length != 0){ if(myresp.prenom_thanato != null && myresp.prenom_thanato.length != 0){
thanatoPrenom = myresp.prenom_thanato; thanatoPrenom = myresp.prenom_thanato;
if(thanatoNom.length > 0 && thanatoPrenom.length > 0){ if(thanatoNom.length > 0 && thanatoPrenom.length > 0){
thanatoFullName += ' ' thanatoFullName += ' '