[Dolibarr-git] [Dolibarr/dolibarr] b5f7f9: FIX Travis fails

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b5f7f962cc835d39c8e0faeeaf3b6311b452f581
      
https://github.com/Dolibarr/dolibarr/commit/b5f7f962cc835d39c8e0faeeaf3b6311b452f581
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/import/import_xlsx.modules.php

  Log Message:
  -----------
  FIX Travis fails


  Commit: f86952dfaa5fef098a89332f23c9d44f1dcd1e15
      
https://github.com/Dolibarr/dolibarr/commit/f86952dfaa5fef098a89332f23c9d44f1dcd1e15
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_societe.sql

  Log Message:
  -----------
  FIX Add missing field fk_shipping_method_id


  Commit: a2b680aa5aab2090ae2010afc53fad322f99b498
      
https://github.com/Dolibarr/dolibarr/commit/a2b680aa5aab2090ae2010afc53fad322f99b498
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into develop


  Commit: 7163ee55f7e7535ac8b996f547af088e5813f393
      
https://github.com/Dolibarr/dolibarr/commit/7163ee55f7e7535ac8b996f547af088e5813f393
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-16 (Sat, 16 Apr 2016)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/import/import_xlsx.modules.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_societe.sql

  Log Message:
  -----------
  Merge pull request #5017 from simnandez/develop

FIX Travis fails


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b7d36da74f9a...7163ee55f7e7