[Dolibarr-git] [Dolibarr/dolibarr] 6259f4: Fix : some & -> &

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/index.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix : some & -> &amp;


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

  Changed paths:
    A htdocs/admin/carrier.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  WIP : Admin for Carriers (Activate/Desactivate)


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

  Changed paths:
    M htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
    M htdocs/core/modules/expedition/methode_expedition_gls.modules.php
    M htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
    M htdocs/core/modules/expedition/methode_expedition_ups.modules.php
    M htdocs/install/mysql/data/llx_c_shipment_mode.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql

  Log Message:
  -----------
  Fix : It was a bad idea to add COL in the code name of new carriers


  Commit: 751488e291620fb2b464c0440b88f55893091dec
      
https://github.com/Dolibarr/dolibarr/commit/751488e291620fb2b464c0440b88f55893091dec
  Author: frederic34 <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M htdocs/comm/propal.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 remote-tracking branch 'upstream/develop' into develop


  Commit: 67c06225a5e16249e8e8d75ddba0060a24eaf52e
      
https://github.com/Dolibarr/dolibarr/commit/67c06225a5e16249e8e8d75ddba0060a24eaf52e
  Author: frederic34 <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M htdocs/admin/carrier.php
    M htdocs/expedition/class/expedition.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/install/mysql/tables/llx_c_shipment_mode.sql

  Log Message:
  -----------
  WIP : Admin for carriers


  Commit: c8872d7e982dd9535c794f871be17d44dc2261bd
      
https://github.com/Dolibarr/dolibarr/commit/c8872d7e982dd9535c794f871be17d44dc2261bd
  Author: frederic34 <address@hidden>
  Date:   2013-02-23 (Sat, 23 Feb 2013)

  Changed paths:
    M htdocs/admin/carrier.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql

  Log Message:
  -----------
  WIP : Admin for carriers


  Commit: 37b94e43c84d078e0eb8d923567b7fbf9cad2975
      
https://github.com/Dolibarr/dolibarr/commit/37b94e43c84d078e0eb8d923567b7fbf9cad2975
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-23 (Sat, 23 Feb 2013)

  Changed paths:
    A htdocs/admin/carrier.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
    M htdocs/core/modules/expedition/methode_expedition_gls.modules.php
    M htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
    M htdocs/core/modules/expedition/methode_expedition_ups.modules.php
    M htdocs/expedition/class/expedition.class.php
    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_shipment_mode.sql
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge pull request #685 from frederic34/develop

WIP : Admin for Carriers


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bbe145cc478b...37b94e43c84d