[Dolibarr-git] [Dolibarr/dolibarr] 4e9447: Merge branch 'develop' of github.com:Dolibarr/doli...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4e9447cbed650815af70526607f8f81f7e126824
      
https://github.com/Dolibarr/dolibarr/commit/4e9447cbed650815af70526607f8f81f7e126824
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-07 (Fri, 07 Sep 2018)

  Changed paths:
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php

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


  Commit: bd3315d5e7ebf181b44302de73ebf54ab5df3a86
      
https://github.com/Dolibarr/dolibarr/commit/bd3315d5e7ebf181b44302de73ebf54ab5df3a86
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-07 (Fri, 07 Sep 2018)

  Changed paths:
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/admin/adherent_emails.php
    M htdocs/adherents/admin/adherent_extrafields.php
    M htdocs/adherents/admin/adherent_type_extrafields.php
    M htdocs/adherents/admin/website.php
    M htdocs/adherents/agenda.php
    M htdocs/adherents/document.php
    M htdocs/adherents/index.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/note.php
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/stats/index.php
    M htdocs/adherents/subscription/card.php
    M htdocs/adherents/subscription/info.php
    M htdocs/adherents/type_ldap.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/menus/other.php
    M htdocs/admin/system/about.php
    M htdocs/admin/system/browser.php
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/system/modules.php
    M htdocs/admin/system/perf.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/class/bankcateg.class.php
    M htdocs/compta/bank/class/paymentvarious.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_20_all_Logevents.class.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    M 
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
    M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/don/class/don.class.php
    M htdocs/don/class/paymentdonation.class.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/class/ecmfiles.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/class/paymentexpensereport.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/holiday/class/holiday.class.php

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


  Commit: 572eb35167adeebad0f04d94d0d92f11027f61b3
      
https://github.com/Dolibarr/dolibarr/commit/572eb35167adeebad0f04d94d0d92f11027f61b3
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-08 (Sat, 08 Sep 2018)

  Changed paths:
    M htdocs/admin/tools/dolibarr_import.php
    M htdocs/admin/tools/index.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/listsessions.php
    M htdocs/admin/tools/update.php

  Log Message:
  -----------
  Standardize and update code


  Commit: c65505fdca9e3cf44178098c44a5710a4283dc68
      
https://github.com/Dolibarr/dolibarr/commit/c65505fdca9e3cf44178098c44a5710a4283dc68
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-08 (Sat, 08 Sep 2018)

  Changed paths:
    M htdocs/admin/holiday.php

  Log Message:
  -----------
  Standardize clean and update code


  Commit: a6b25093e7fe8dab7b99b0cb8a09df8580098707
      
https://github.com/Dolibarr/dolibarr/commit/a6b25093e7fe8dab7b99b0cb8a09df8580098707
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-08 (Sat, 08 Sep 2018)

  Changed paths:
    M htdocs/admin/pdf.php
    M htdocs/admin/supplierinvoice_extrafields.php

  Log Message:
  -----------
  Standardize and update code


  Commit: da37302dc2a9075a116e4b59d2c1c3c39f9f2aef
      
https://github.com/Dolibarr/dolibarr/commit/da37302dc2a9075a116e4b59d2c1c3c39f9f2aef
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-09-12 (Wed, 12 Sep 2018)

  Changed paths:
    M htdocs/admin/holiday.php
    M htdocs/admin/pdf.php
    M htdocs/admin/supplierinvoice_extrafields.php
    M htdocs/admin/tools/dolibarr_import.php
    M htdocs/admin/tools/index.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/listsessions.php
    M htdocs/admin/tools/update.php

  Log Message:
  -----------
  Merge pull request #9437 from grandoc/new_branch_08_09_2018

New branch 08 09 2018


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bdcbc71ce95f...da37302dc2a9
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.