[Dolibarr-git] [Dolibarr/dolibarr] 308ee4: Fix Lang part2

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 308ee401347978258e914d0e9476f33917064902
      
https://github.com/Dolibarr/dolibarr/commit/308ee401347978258e914d0e9476f33917064902
  Author: Francis Appels <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/suppliers.lang

  Log Message:
  -----------
  Fix Lang part2

Fix lang in en_us


  Commit: c5599efe62b78b56dee4dbb2df3edc91027f564c
      
https://github.com/Dolibarr/dolibarr/commit/c5599efe62b78b56dee4dbb2df3edc91027f564c
  Author: Francis Appels <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Don't show 'undifined' when no max delivery time


  Commit: 8be83cd04346b11175bc011cf14d33fd622f47f6
      
https://github.com/Dolibarr/dolibarr/commit/8be83cd04346b11175bc011cf14d33fd622f47f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/suppliers.lang

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

Conflicts:
        htdocs/langs/en_US/sendings.lang


  Commit: f80674f1e33b3888b03e71d91aaa41edbe613e56
      
https://github.com/Dolibarr/dolibarr/commit/f80674f1e33b3888b03e71d91aaa41edbe613e56
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/suppliers.lang

  Log Message:
  -----------
  git push origin developMerge branch 'fappels-develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b3fc8d294073...f80674f1e33b