[Dolibarr-git] [Dolibarr/dolibarr] e99b0d: Fix: Select prospect, customer or both

[eldy]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e99b0dd96f445cf3ea4fee13fb62720898bab616
      
https://github.com/Dolibarr/dolibarr/commit/e99b0dd96f445cf3ea4fee13fb62720898bab616
  Author: eldy <address@hidden>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: Select prospect, customer or both


  Commit: 2ecb113d30c08e2a5178f50ffbe0c8a05751b71e
      
https://github.com/Dolibarr/dolibarr/commit/2ecb113d30c08e2a5178f50ffbe0c8a05751b71e
  Author: eldy <address@hidden>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: categories are set onto category tab


  Commit: 4f1c4f0365010cb5da10453878704423e54d5769
      
https://github.com/Dolibarr/dolibarr/commit/4f1c4f0365010cb5da10453878704423e54d5769
  Author: eldy <address@hidden>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ChangeLog
    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/compta/facture.php
    M htdocs/core/boxes/box_activity.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/fourn/class/fournisseur.commande.class.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/societe/admin/societe.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/66debfe19e9e...4f1c4f036501