[Dolibarr-git] [Dolibarr/dolibarr] c421a3: Merge remote-tracking branch 'upstream/4.0' into d...

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c421a3096e654cd695ad8a233afc1fbfb5d99d6b
      
https://github.com/Dolibarr/dolibarr/commit/c421a3096e654cd695ad8a233afc1fbfb5d99d6b
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/fourn/facture/list.php

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


  Commit: 2d6d3502ac61aff9cc59951df9e7cbac7540a062
      
https://github.com/Dolibarr/dolibarr/commit/2d6d3502ac61aff9cc59951df9e7cbac7540a062
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M htdocs/contact/list.php
    M htdocs/contrat/list.php

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


  Commit: 00496cd49e1bd14f64757380ed9571c4f2b4f358
      
https://github.com/Dolibarr/dolibarr/commit/00496cd49e1bd14f64757380ed9571c4f2b4f358
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M .travis.yml
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/list.php
    A htdocs/accountancy/bookkeeping/listbyaccount.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/tpl/export_journal.tpl.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contact/card.php
    M htdocs/core/ajax/saveinplace.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/genericobject.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modDeplacement.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modWebsites.class.php
    M htdocs/expedition/card.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/filefunc.inc.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/view_log.php
    M htdocs/install/check.php
    M htdocs/install/fileconf.php
    A htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_ecm_files.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_website.sql
    M htdocs/langs/en_US/website.lang
    M htdocs/main.inc.php
    M htdocs/projet/element.php
    M htdocs/societe/class/societe.class.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/theme/md/img/info.png
    M htdocs/theme/md/img/title_accountancy.png
    M htdocs/theme/md/img/title_products.png
    M htdocs/theme/md/style.css.php
    M htdocs/websites/class/website.class.php
    M htdocs/websites/index.php
    M test/phpunit/ExportTest.php
    M test/phpunit/WebservicesInvoicesTest.php

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


  Commit: 8a022fb19db8ef2abb7af18408ee3ef28ad02ed2
      
https://github.com/Dolibarr/dolibarr/commit/8a022fb19db8ef2abb7af18408ee3ef28ad02ed2
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M dev/initdata/import-products.php
    M dev/initdata/import-thirdparties.php
    M dev/initdata/import-users.php
    M dev/initdata/purge-data.php

  Log Message:
  -----------
  NEW Do not use Function Aliases


  Commit: 88d12618ce4ab69d830509e9d1e615337eae9d2a
      
https://github.com/Dolibarr/dolibarr/commit/88d12618ce4ab69d830509e9d1e615337eae9d2a
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_list.php
    M dev/translation/autotranslator.class.php
    M dev/translation/sanity_check_en_langfiles.php

  Log Message:
  -----------
  NEW Do not use Functions Aliases


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

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php

  Log Message:
  -----------
  NEW Do not use Functions Aliases


  Commit: 62c1302a276f94626fda182af1f8be1da532e4ff
      
https://github.com/Dolibarr/dolibarr/commit/62c1302a276f94626fda182af1f8be1da532e4ff
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/system/phpinfo.php

  Log Message:
  -----------
  NEW Do not use Functions Aliases


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

  Changed paths:
    M dev/initdata/import-products.php
    M dev/initdata/import-thirdparties.php
    M dev/initdata/import-users.php
    M dev/initdata/purge-data.php
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_list.php
    M dev/translation/autotranslator.class.php
    M dev/translation/sanity_check_en_langfiles.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/system/phpinfo.php

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

NEW Do not use Functions Aliases


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7263b29cb40b...d932bb953297