Subversion Repositories eFlore/Applications.coel

Rev

Rev 411 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 411 Rev 419
Line 687... Line 687...
687 
			structureCollectee.setCodePostal(cpChp.getValue());
 687 
			structureCollectee.setCodePostal(cpChp.getValue());
688 
			structureCollectee.setVille(villeChp.getValue());
 688 
			structureCollectee.setVille(villeChp.getValue());
689 
			structureCollectee.setRegion(regionChp.getValue());
 689 
			structureCollectee.setRegion(regionChp.getValue());
690 
			structureCollectee.setPays(null);
 690 
			structureCollectee.setPays(null);
691 
			if (comboPays.getValue() != null) {
 691 
			if (comboPays.getValue() != null) {
692 
				structureCollectee.setPays(comboPays.getValue().getAbreviation());
 692 
				structureCollectee.setPays(comboPays.getValue().getId());
693 
			} else if (comboPays.getRawValue() != "") {
 693 
			} else if (comboPays.getRawValue() != "") {
694 
				structureCollectee.setPays(comboPays.getRawValue());
 694 
				structureCollectee.setPays(comboPays.getRawValue());
695 
			}
 695 
			}
Line 696... Line 696...
696
696
Line 755... Line 755...
755
755
756 
			adrChp.setValue(identification.getAdresse());
 756 
			adrChp.setValue(identification.getAdresse());
757 
			cpChp.setValue(identification.getCodePostal());
 757 
			cpChp.setValue(identification.getCodePostal());
758 
			villeChp.setValue(identification.getVille());
 758 
			villeChp.setValue(identification.getVille());
759 
			regionChp.setValue(identification.getRegion());
 759 
			regionChp.setValue(identification.getRegion());
760 
			if (identification.getPays().matches("^[A-Z]{2}$")) {
 760 
			if (identification.getPays().matches("^[0-9]+$")) {
761 
				comboPays.setValue(comboPays.getStore().findModel("abreviation", identification.getPays()));
 761 
				comboPays.setValue(comboPays.getStore().findModel("id_valeur", identification.getPays()));
762 
			} else {
 762 
			} else {
763 
				comboPays.setRawValue(identification.getPays());
 763 
				comboPays.setRawValue(identification.getPays());
Line 764... Line 764...
764 
			}
 764 
			}