Mise a jour depuis Portable linux lui meme mis ajour depuis portable windows
Merge github.com:bernardgibert/TLintranet

Conflicts:
	A_faire_JM_autofill.php
	A_faire_JM_dml.php
	A_faire_JM_view.php
	A_faire_autofill.php
	A_faire_dml.php
	A_faire_view.php
	Acces_sites_Internet_autofill.php
	Acces_sites_Internet_dml.php
	Acces_sites_Internet_view.php
	Achat_autofill.php
	Achat_dml.php
	Achat_rappel.php
	Achat_view.php
	AttestationsTSADannuelles_action1.php
	AttestationsTSADannuelles_action1B.php
	AttestationsTSADannuelles_action2.php
	AttestationsTSADannuelles_autofill.php
	AttestationsTSADannuelles_courrier.php
	AttestationsTSADannuelles_dml.php
	AttestationsTSADannuelles_sms.php
	AttestationsTSADannuelles_statistics.php
	AttestationsTSADannuelles_view.php
	Client_autofill.php
	Client_dedouble.php
	Client_genere_attest_tsad.php
	Client_historique_reparations.php
	Client_maj_historique.php
	Client_nouveau_OD.php
	Client_nouveau_devis_cc_bl.php
	Client_nouveau_mot_de_passe.php
	Client_nouveau_sms.php
	Client_nouvel_email_obsolete.php
	Client_nouvel_encaissement.php
	Client_nouvelle_fact_SAD.php
	Client_nouvelle_fact_TechnoLandes.php
	Client_place_passwords_dans_infos.php
	Client_relance.php
	Client_reparations.php
	Client_view.php
	Encaissement_autofill.php
	Encaissement_dml.php
	Encaissement_maj_remise_en_banque.php
	Encaissement_par_virement.php
	Encaissement_print.php
	Encaissement_view.php
	Extranet_login.php
	Factures_autofill.php
	Factures_dml.php
	Factures_liste_retard.php
	Factures_loc_view.php
	Factures_view.php
	Fournisseur_autofill.php
	Fournisseur_dml.php
	Fournisseur_view.php
	Index_Cherche_mot_cle.php
	Items_CCSO.php
	Items_CCSO_SAD.php
	OD_autofill.php
	OD_dml.php
	OD_view.php
	Outils/2013-Liste-attestations.txt
	Outils/a_faire/246-print.phachep
	Outils/a_faire/249-PDV-DECEMBRE-2011.txt
	Outils/a_faire/296-471CHB.txt
	Outils/a_faire/61-nouvelles-r-gles.txt
	Outils/a_faire_jm/40-Liste-attestations-tsad-corrige.txt
	Outils/a_faire_jm/40-Liste-attestations-tsad.txt
	Outils/au_cas_ou/client_relance_gen_pdf.php
	Outils/ecritures_de_routine/EDFGDF.csv
	Outils/ecritures_de_routine/Emprunt_Voiture_Pelletier.csv
	Outils/ecritures_de_routine/Emprunt_terrain_batiments.csv
	Outils/ecritures_de_routine/GAN_alter_ego.csv
	Outils/ecritures_de_routine/GAN_evolution.csv
	Outils/ecritures_de_routine/Loyer_BNP.csv
	Outils/ecritures_de_routine/Loyer_Technolandes.csv
	Outils/ecritures_de_routine/Loyer_sci_gascogne.csv
	Outils/ecritures_de_routine/MACIF.csv
	Outils/font/courier.php
	Outils/font/helvetica.php
	Outils/font/helveticab.php
	Outils/font/helveticabi.php
	Outils/font/helveticai.php
	Outils/font/makefont/makefont.php
	Outils/font/symbol.php
	Outils/font/times.php
	Outils/font/timesb.php
	Outils/font/timesbi.php
	Outils/font/timesi.php
	Outils/font/zapfdingbats.php
	Outils/fpdf.css
	Outils/fpdf.php
	Outils/index.html
	Outils/mots_cle/168-bou-e-inertie.svg
	Outils/reparations/471-reparations-templateDV.html
	Outils/spooler/2227-ticket.txt
	Outils/transfert_en_compta/-certificats.srl
	Outils/transfert_en_compta/1303-banqueTL.csv
	Outils/transfert_en_compta/1303-banqueTL_corrige.txt
	Outils/transfert_en_compta/1303-journal_de_banque.txt
	Outils/transfert_en_compta/1303-sad4672.csv
	Outils/transfert_en_compta/1303-tl4675.csv
	Outils/transfert_en_compta/1304-banqueTL.csv
	Outils/transfert_en_compta/1305-banqueTL.csv
	Outils/transfert_en_compta/1306-banqueTL.csv
	Outils/transfert_en_compta/1307-banqueTL.csv
	Outils/tva/tous-tvaSCI.txt
	Outils/tva/tous-tvaTL.txt
	Outils/tva/tous-tvaTSAD.txt
	Outils/upload.php
	Pointage.html
	RMA_autofill.php
	RMA_dml.php
	RMA_view.php
	Rappel_automatique_autofill.php
	Rappel_automatique_dml.php
	Rappel_automatique_view.php
	RemiseCheques_TransmissionCB.php
	RemiseCheques_bordereau.php
	RemiseCheques_calcul_total.php
	Reparations.html
	Salaires_autofill.php
	Salaires_dml.php
	Salaires_ecritures_compta_tsad.php
	Salaires_view.php
	ShoppingList_autofill.php
	ShoppingList_dml.php
	ShoppingList_view.php
	Transfert_en_compta_achats.php
	Transfert_en_compta_achats_TSAD.php
	Transfert_en_compta_autofill.php
	Transfert_en_compta_balance.php
	Transfert_en_compta_banque.php
	Transfert_en_compta_banque2.php
	Transfert_en_compta_banqueSAD.php
	Transfert_en_compta_banqueTL.php
	Transfert_en_compta_banque_add_line.php
	Transfert_en_compta_banque_add_line2.php
	Transfert_en_compta_banque_ajout_compte.php
	Transfert_en_compta_banque_ajout_info.php
	Transfert_en_compta_banque_delete_line.php
	Transfert_en_compta_banque_edit_line.php
	Transfert_en_compta_banque_edit_line2.php
	Transfert_en_compta_caisse.php
	Transfert_en_compta_caisse_nouveau.php
	Transfert_en_compta_compare_sad4672_tl4675.php
	Transfert_en_compta_dml.php
	Transfert_en_compta_factures.php
	Transfert_en_compta_factures1.php
	Transfert_en_compta_factures2.php
	Transfert_en_compta_framework.php
	Transfert_en_compta_gene_routine.php
	Transfert_en_compta_gene_tva.php
	Transfert_en_compta_impayes.php
	Transfert_en_compta_lettrage_ventes.php
	Transfert_en_compta_regroupe_caisse.php
	Transfert_en_compta_regroupe_trimestre.php
	Transfert_en_compta_regularisation.php
	Transfert_en_compta_retourner_csv.php
	Transfert_en_compta_toutes_banques2.php
	Transfert_en_compta_ventes.php
	Transfert_en_compta_ventes_check_bl_a_fact.php
	Transfert_en_compta_ventes_cyber.php
	Transfert_en_compta_view.php
	achat_save_backup_hendaye
	achat_test.html
	activite_nicolas_autofill.php
	activite_nicolas_dml.php
	activite_nicolas_view.php
	admin/images/index.html
	admin/incCommon.php
	admin/incConfig.php
	admin/incFooter.php
	admin/incFunctions.php
	admin/incHeader.php
	admin/index.php
	admin/pageAssignOwners.php
	admin/pageChangeMemberStatus.php
	admin/pageDeleteGroup.php
	admin/pageDeleteMember.php
	admin/pageDeleteRecord.php
	admin/pageEditGroup.php
	admin/pageEditMember.php
	admin/pageEditOwnership.php
	admin/pageHome.php
	admin/pageLogin.php
	admin/pageMail.php
	admin/pagePrintRecord.php
	admin/pageSender.php
	admin/pageSettings.php
	admin/pageTransferOwnership.php
	admin/pageUploadCSV.php
	admin/pageViewGroups.php
	admin/pageViewMembers.php
	admin/pageViewRecords.php
	admin/toolTipData.js
	admin/toolTips.js
	adresses_telephone_autofill.php
	adresses_telephone_dml.php
	adresses_telephone_view.php
	appgini.axp
	article_aspire_image.php
	article_autofill.php
	article_complete_fiche.php
	article_dml.php
	article_edit_tarifs.php
	article_footer.php
	article_gen_etiquettes.php
	article_gen_etiquettes_pdf.php
	article_import_ebp.php
	article_maj_ht.php
	article_maj_tous_ttc.php
	article_nouvelle_ligne_de_facture.php
	article_recherche_ebp.php
	article_view.php
	backup_apply_sql.php
	backup_filter_archives.php
	backup_index.php
	backup_lib.php
	backup_lock_local_site.php
	backup_lock_remote_site.php
	backup_mise_a_jour_locale.php
	backup_passage_en_mode_secours.php
	backup_retour_en_mode_standard.php
	backup_sauvegarde_puis_extinction.php
	backup_spawn_db.php
	backup_spawn_db_remote.php
	backup_unlock_local_site.php
	backup_unlock_remote_site.php
	cables_et_accessoires_autofill.php
	cables_et_accessoires_dml.php
	cables_et_accessoires_view.php
	checkMemberID.php
	client_add_membership_users.php
	client_create_extranet_access.php
	client_encaissement_cloturer_reparations.php
	client_encaissement_confirm_clotur_rep.php
	client_fetch_attestation.php
	client_import.php
	client_list_all_codes.php
	client_merge_listes.php
	code_barre_page.php
	code_barre_prefixes.php
	compte6_autofill.php
	compte6_dml.php
	compte6_view.php
	compteur.html
	compteur.php
	compteur1.html
	config.php
	credit_d_impots.php
	crypt.php
	curl.php
	datalist.php
	decrypt.php
	defaultLang.php
	dessins_autofill.php
	dessins_dml.php
	dessins_view.php
	devis_cc_bl_MO_to_delete.php
	devis_cc_bl_autofill.php
	devis_cc_bl_delete.php
	devis_cc_bl_gen_fact_TL.php
	devis_cc_bl_gen_pdf.php
	devis_cc_bl_view.php
	devis_cc_bl_view_delete_line.php
	docs_divers_airial_wifi_trace.php
	docs_divers_autofill.php
	docs_divers_dml.php
	docs_divers_view.php
	documentation minimum.txt
	example.php
	extranet_display_page.php
	facture_MO.php
	facture_TSAD_autofill.php
	facture_TSAD_delete.php
	facture_TSAD_dml.php
	facture_TSAD_view.php
	facture_TSAD_view_delete_line.php
	facture_TechnoLandes_autofill.php
	facture_TechnoLandes_delete.php
	facture_TechnoLandes_dml.php
	facture_TechnoLandes_view.php
	facture_TechnoLandes_view_delete_line.php
	facture_gen_pdf.php
	facture_nouvelle_ligne_sans_article.php
	font/courier.php
	font/helvetica.php
	font/helveticab.php
	font/helveticabi.php
	font/helveticai.php
	font/index.php
	font/makefont/makefont.php
	font/symbol.php
	font/times.php
	font/timesb.php
	font/timesbi.php
	font/timesi.php
	font/zapfdingbats.php
	footer.php
	fpdf.php
	ftp.php
	header.php
	header_0.php
	images/banque_avril_11.csv
	incCommon.php
	index.html
	index.php
	index0.html
	index_retour.php
	javascript_debug_infos
	language.php
	language_french.php
	lettrage_remise_cheques.php
	lib.php
	ligne_de_facture_autofill.php
	ligne_de_facture_dml.php
	ligne_de_facture_view.php
	membership_passwordReset.php
	membership_signup.php
	membership_thankyou.php
	mots_cle_autofill.php
	mots_cle_dml.php
	mots_cle_view.php
	nous_contacter.html
	nous_contacter.php
	nous_contacter_depoussierrage.php
	nous_contacter_send.php
	nous_contacter_skydsl.php
	outils_divers.css
	outils_divers.php
	outils_divers3.php
	outils_divers4.php
	outils_divers_control_focus.php
	papa_data.txt
	parse.php
	pdf_lib.php
	pdf_lib1.php
	pieces_en_stock_autofill.php
	pieces_en_stock_dml.php
	pieces_en_stock_view.php
	print_barcode.php
	print_ticket.php
	prototype.js
	rappel_go.php
	rapprochement_encaissements_remise_cartes.php
	rapprochement_encaissements_remise_cheques.php
	releve_lettres_de_change_autofill.php
	releve_lettres_de_change_dml.php
	releve_lettres_de_change_view.php
	remisecheques_autofill.php
	remisecheques_dml.php
	remisecheques_view.php
	reparations_alert_trop_vieille.php
	reparations_autofill.php
	reparations_dml.php
	reparations_index.php
	reparations_preventif.php
	reparations_print.php
	reparations_status.php
	reparations_view.php
	routines_comptables_autofill.php
	routines_comptables_dml.php
	routines_comptables_view.php
	setup.md5
	setup.php
	skydsl.html
	sms_autofill.php
	sms_dml.php
	sms_exec.php
	sms_retry_failed.php
	sms_view.php
	souche_chequier_autofill.php
	souche_chequier_dml.php
	souche_chequier_view.php
	style.css
	style2.css
	templates/A_faire_JM_templateDV.html
	templates/A_faire_JM_templateTV.html
	templates/A_faire_JM_templateTVS.html
	templates/A_faire_templateDV.html
	templates/A_faire_templateTV.html
	templates/A_faire_templateTVS.html
	templates/Acces_sites_Internet_templateDV.html
	templates/Acces_sites_Internet_templateTV.html
	templates/Acces_sites_Internet_templateTVS.html
	templates/Achat_templateDV.html
	templates/Achat_templateTV.html
	templates/Achat_templateTVS.html
	templates/AttestationsTSADannuelles_templateDV.html
	templates/AttestationsTSADannuelles_templateTV.html
	templates/AttestationsTSADannuelles_templateTVS.html
	templates/Client_templateDV.html
	templates/Client_templateDV_for_admin.html
	templates/Client_templateTV.html
	templates/Client_templateTVS.html
	templates/Encaissement_templateDV.html
	templates/Encaissement_templateTV.html
	templates/Encaissement_templateTVS.html
	templates/Factures_templateDV.html
	templates/Factures_templateTV.html
	templates/Factures_templateTVS.html
	templates/Fournisseur_templateDV.html
	templates/Fournisseur_templateTV.html
	templates/Fournisseur_templateTVS.html
	templates/ItemPattern_templateDV.html
	templates/ItemPattern_templateTV.html
	templates/ItemPattern_templateTVS.html
	templates/OD_templateDV.html
	templates/OD_templateTV.html
	templates/OD_templateTVS.html
	templates/RMA_templateDV.html
	templates/RMA_templateTV.html
	templates/RMA_templateTVS.html
	templates/Rappel_automatique_templateDV.html
	templates/Rappel_automatique_templateTV.html
	templates/Rappel_automatique_templateTVS.html
	templates/Relance_client_templateDV.html
	templates/Relance_client_templateTV.html
	templates/Relance_client_templateTVS.html
	templates/Salaires_templateDV.html
	templates/Salaires_templateTV.html
	templates/Salaires_templateTVS.html
	templates/ShoppingList_templateDV.html
	templates/ShoppingList_templateTV.html
	templates/ShoppingList_templateTVS.html
	templates/Transfert_en_compta_templateDV.html
	templates/Transfert_en_compta_templateTV.html
	templates/Transfert_en_compta_templateTVS.html
	templates/activite_nicolas_templateDV.html
	templates/activite_nicolas_templateTV.html
	templates/activite_nicolas_templateTVS.html
	templates/adresses_telephone_templateDV.html
	templates/adresses_telephone_templateTV.html
	templates/adresses_telephone_templateTVS.html
	templates/article_templateDV.html
	templates/article_templateTV.html
	templates/article_templateTVS.html
	templates/article_template_visitorDV.html
	templates/article_template_visitorTV.html
	templates/article_template_visitorTVS.html
	templates/cables_et_accessoires_templateDV.html
	templates/cables_et_accessoires_templateTV.html
	templates/cables_et_accessoires_templateTVS.html
	templates/compte6_templateDV.html
	templates/compte6_templateTV.html
	templates/compte6_templateTVS.html
	templates/dessins_templateDV.html
	templates/dessins_templateTV.html
	templates/dessins_templateTVS.html
	templates/devis_cc_bl_templateTV.html
	templates/devis_cc_bl_templateTVS.html
	templates/docs_divers_templateDV.html
	templates/docs_divers_templateTV.html
	templates/docs_divers_templateTVS.html
	templates/facture_TSAD_templateDV.html
	templates/facture_TSAD_templateTV.html
	templates/facture_TechnoLandes_templateDV.html
	templates/facture_TechnoLandes_templateTV.html
	templates/facture_TechnoLandes_templateTVS.html
	templates/ligne_de_facture_templateDV.html
	templates/ligne_de_facture_templateTV.html
	templates/ligne_de_facture_templateTVS.html
	templates/mots_cle_templateDV.html
	templates/mots_cle_templateTV.html
	templates/mots_cle_templateTVS.html
	templates/pieces_en_stock_templateTV.html
	templates/pieces_en_stock_templateTVS.html
	templates/releve_lettres_de_change_templateDV.html
	templates/releve_lettres_de_change_templateTV.html
	templates/releve_lettres_de_change_templateTVS.html
	templates/remisecheques_templateDV.html
	templates/remisecheques_templateDV1.html
	templates/remisecheques_templateTV.html
	templates/remisecheques_templateTVS.html
	templates/reparations_templateDV.html
	templates/reparations_templateTV.html
	templates/reparations_templateTVS.html
	templates/routines_comptables_templateDV.html
	templates/routines_comptables_templateTV.html
	templates/routines_comptables_templateTVS.html
	templates/sms_templateDV.html
	templates/sms_templateTV.html
	templates/sms_templateTVS.html
	templates/souche_chequier_templateDV.html
	templates/souche_chequier_templateTV.html
	templates/souche_chequier_templateTVS.html
	templates/tva_templateDV.html
	templates/tva_templateTV.html
	templates/tva_templateTVS.html
	test_Items_BNP.php
	testjquery.html
	tva_autofill.php
	tva_dml.php
	tva_view.php
	updateDB.php