689,7 → 689,7 |
structureCollectee.setRegion(regionChp.getValue()); |
structureCollectee.setPays(null); |
if (comboPays.getValue() != null) { |
structureCollectee.setPays(comboPays.getValue().getAbreviation()); |
structureCollectee.setPays(comboPays.getValue().getId()); |
} else if (comboPays.getRawValue() != "") { |
structureCollectee.setPays(comboPays.getRawValue()); |
} |
757,8 → 757,8 |
cpChp.setValue(identification.getCodePostal()); |
villeChp.setValue(identification.getVille()); |
regionChp.setValue(identification.getRegion()); |
if (identification.getPays().matches("^[A-Z]{2}$")) { |
comboPays.setValue(comboPays.getStore().findModel("abreviation", identification.getPays())); |
if (identification.getPays().matches("^[0-9]+$")) { |
comboPays.setValue(comboPays.getStore().findModel("id_valeur", identification.getPays())); |
} else { |
comboPays.setRawValue(identification.getPays()); |
} |