[Dolibarr-git] [Dolibarr/dolibarr] 87dc3a: LDAP sync : trigger was launched even if LDAP_SYNC...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 87dc3a0b22768e6f80f45b6a7d1c2a9236f088cb
      
https://github.com/Dolibarr/dolibarr/commit/87dc3a0b22768e6f80f45b6a7d1c2a9236f088cb
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php

  Log Message:
  -----------
  LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 
'ldap2dolibarr'


  Commit: 04e1be4afd686393caaf2c0b0cebca4f2684d410
      
https://github.com/Dolibarr/dolibarr/commit/04e1be4afd686393caaf2c0b0cebca4f2684d410
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    R htdocs/comm/addpropal.php
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    A htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
    A htdocs/core/modules/expedition/methode_expedition_gls.modules.php
    A htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
    A htdocs/core/modules/expedition/methode_expedition_ups.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/install/mysql/data/llx_c_shipment_mode.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/liste.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: 0358ef49187b041d198ff0e5e21b2bde50b1f923
      
https://github.com/Dolibarr/dolibarr/commit/0358ef49187b041d198ff0e5e21b2bde50b1f923
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M scripts/user/sync_users_ldap2dolibarr.php

  Log Message:
  -----------
  LDAP : sync script now updates or create user


  Commit: cfa1a41a16b09cb0141d323f8dc1eb47e3c24800
      
https://github.com/Dolibarr/dolibarr/commit/cfa1a41a16b09cb0141d323f8dc1eb47e3c24800
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    A dev/test/testdiv.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/cotisations.php
    M htdocs/adherents/document.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/index.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/liste.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/type.php
    A htdocs/admin/carrier.php
    M htdocs/admin/company.php
    M htdocs/admin/confexped.php
    M htdocs/admin/dict.php
    M htdocs/admin/expedition.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/livraison.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/security_other.php
    M htdocs/bookmarks/liste.php
    M htdocs/boutique/commande/class/boutiquecommande.class.php
    M htdocs/boutique/commande/fiche.php
    M htdocs/cashdesk/index_verif.php
    M htdocs/cashdesk/tpl/menu.tpl.php
    M htdocs/categories/categorie.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/address.php
    M htdocs/comm/bookmark.php
    M htdocs/comm/contact.php
    M htdocs/comm/list.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/customer.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/clients.php
    M htdocs/compta/deplacement/index.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/dons/liste.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/index.php
    M htdocs/compta/localtax/index.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/contact/vcard.php
    M htdocs/core/ajax/ziptown.php
    M htdocs/core/antispamimage.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/class/translate.class.php
    A htdocs/core/getmenu_jmobile.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/smartphone/smartphone.lib.php
    M htdocs/core/menus/smartphone/smartphone_menu.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    R htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
    R htdocs/core/modules/expedition/methode_expedition_gls.modules.php
    R htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
    R htdocs/core/modules/expedition/methode_expedition_ups.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modDeplacement.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modGravatar.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modPaybox.class.php
    M htdocs/core/modules/modPaypal.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    A htdocs/core/search_jmobile.php
    M htdocs/core/tools.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/commande/history.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/index.php
    M htdocs/fourn/liste.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/fiche.php
    M htdocs/holiday/index.php
    M htdocs/holiday/month_report.php
    M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_c_shipment_mode.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_c_pays.key.sql
    M htdocs/install/mysql/tables/llx_c_shipment_mode.sql
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche-valo.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/donations/donateurs_code.php
    M htdocs/public/members/new.php
    M htdocs/public/members/public_list.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/societe/agenda.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/commerciaux.php
    M htdocs/societe/lien.php
    M htdocs/societe/notify/fiche.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/phones/smartphone/tpl/menu.tpl.php
    M htdocs/user/class/user.class.php
    M htdocs/user/clicktodial.php
    M htdocs/user/fiche.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php
    M htdocs/webservices/server_contact.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M test/phpunit/AdherentTest.php
    M test/selenium/test_thirdparty.xml

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: 428f844b4d157a45537c349f6449e976dc7c862c
      
https://github.com/Dolibarr/dolibarr/commit/428f844b4d157a45537c349f6449e976dc7c862c
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M htdocs/core/class/ldap.class.php

  Log Message:
  -----------
  LDAP : add option to get data as an array


  Commit: 00e8f78b776e4104e73128e0c9fecfdb93adc28f
      
https://github.com/Dolibarr/dolibarr/commit/00e8f78b776e4104e73128e0c9fecfdb93adc28f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M htdocs/core/class/ldap.class.php
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    M scripts/user/sync_users_ldap2dolibarr.php

  Log Message:
  -----------
  Merge pull request #692 from atm-maxime/develop

LDAP sync improvements


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b9ead0896804...00e8f78b776e