[Dolibarr-git] [Dolibarr/dolibarr] 36ec75: Set same icon status rule as for thirdparty

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 36ec7509ac640a34dfc5f45088b5bb0a386bb522
      
https://github.com/Dolibarr/dolibarr/commit/36ec7509ac640a34dfc5f45088b5bb0a386bb522
  Author: Florian Henry <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M htdocs/contact/class/contact.class.php

  Log Message:
  -----------
  Set same icon status rule as for thirdparty


  Commit: d000e9b6d0f2614455b8331ce21b39a3a83d55a4
      
https://github.com/Dolibarr/dolibarr/commit/d000e9b6d0f2614455b8331ce21b39a3a83d55a4
  Author: Florian Henry <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M htdocs/comm/mailing/cibles.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/societe/class/societe.class.php

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


  Commit: 0d2a019c3f1cf3decd6878066dcb85bd66a34880
      
https://github.com/Dolibarr/dolibarr/commit/0d2a019c3f1cf3decd6878066dcb85bd66a34880
  Author: Florian Henry <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

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

  Log Message:
  -----------
  Extrafield : better filter on select from table management for
extrafields table


  Commit: addedb6f150e87175ba8396b7ac346313eafe110
      
https://github.com/Dolibarr/dolibarr/commit/addedb6f150e87175ba8396b7ac346313eafe110
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/extrafields.class.php

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

Conflicts:
        htdocs/core/class/extrafields.class.php


  Commit: 27b33cafe65af20d63f835ffb911b48d0f531345
      
https://github.com/Dolibarr/dolibarr/commit/27b33cafe65af20d63f835ffb911b48d0f531345
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M README-FR
    M htdocs/adherents/admin/adherent.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/document.php
    M htdocs/core/lib/xcal.lib.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/cron.lang

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c4a43890c4b0...27b33cafe65a