[Dolibarr-git] [Dolibarr/dolibarr] 26aba2: Add tracking url for carriers in dict

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 26aba2b609d237e282407ae9e6a9a612f72c8d94
      
https://github.com/Dolibarr/dolibarr/commit/26aba2b609d237e282407ae9e6a9a612f72c8d94
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Add tracking url for carriers in dict


  Commit: bfb05c78cd151d2f04d2f90f958f0ba42e8471bd
      
https://github.com/Dolibarr/dolibarr/commit/bfb05c78cd151d2f04d2f90f958f0ba42e8471bd
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    R htdocs/admin/carrier.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    R htdocs/core/modules/expedition/methode_expedition.modules.php
    R htdocs/core/modules/expedition/methode_expedition_colsui.modules.php
    R htdocs/core/modules/expedition/methode_expedition_enl.modules.php
    R htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php
    R htdocs/core/modules/expedition/methode_expedition_trans.modules.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Change carrier config into dict instead of dedicated conf page


  Commit: a9974f66b29eb941c7863d7b9386803e37426095
      
https://github.com/Dolibarr/dolibarr/commit/a9974f66b29eb941c7863d7b9386803e37426095
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

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

  Log Message:
  -----------
  Fix : url was given even if value of tracking was empty + remove old use of 
"methode_expedition..." files


  Commit: cf945f0187a9e7969a951f2f299f41f8d2ed9821
      
https://github.com/Dolibarr/dolibarr/commit/cf945f0187a9e7969a951f2f299f41f8d2ed9821
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/stock.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/note.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/note.php
    M htdocs/install/default.css
    M htdocs/install/fileconf.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    A htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
    A htdocs/install/mysql/tables/llx_opensurvey_comments.sql
    A htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
    A htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
    A htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
    A htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
    M htdocs/install/mysql/tables/llx_product.key.sql
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/stocks.lang
    R htdocs/opensurvey/sql/llx_opensurvey_comments.key.sql
    R htdocs/opensurvey/sql/llx_opensurvey_comments.sql
    R htdocs/opensurvey/sql/llx_opensurvey_sondage.key.sql
    R htdocs/opensurvey/sql/llx_opensurvey_sondage.sql
    R htdocs/opensurvey/sql/llx_opensurvey_user_studs.key.sql
    R htdocs/opensurvey/sql/llx_opensurvey_user_studs.sql
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks/note.php
    M htdocs/user/note.php
    M htdocs/user/perms.php

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


  Commit: 571037d39641e416315ac5e47a231e1dd801c8a1
      
https://github.com/Dolibarr/dolibarr/commit/571037d39641e416315ac5e47a231e1dd801c8a1
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Fix : consumption on company


  Commit: 129da11a52b957065d9659f01b8c096a9e21efeb
      
https://github.com/Dolibarr/dolibarr/commit/129da11a52b957065d9659f01b8c096a9e21efeb
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Fix : consumption


  Commit: ef13ea8690df67a35e500a66a14e7bcb4eb00037
      
https://github.com/Dolibarr/dolibarr/commit/ef13ea8690df67a35e500a66a14e7bcb4eb00037
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  New # 786 : can link project from supplier invoice creation


  Commit: 12caa20e388dfcb48b6e02347710f487da96640c
      
https://github.com/Dolibarr/dolibarr/commit/12caa20e388dfcb48b6e02347710f487da96640c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-20 (Sat, 20 Apr 2013)

  Changed paths:
    R htdocs/admin/carrier.php
    M htdocs/admin/confexped.php
    M htdocs/admin/dict.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    R htdocs/core/modules/expedition/methode_expedition.modules.php
    R htdocs/core/modules/expedition/methode_expedition_colsui.modules.php
    R htdocs/core/modules/expedition/methode_expedition_enl.modules.php
    R htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php
    R htdocs/core/modules/expedition/methode_expedition_trans.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/societe/consumption.php

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

Carrier conf modification


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a4c23b1dcdb0...12caa20e388d