[Dolibarr-git] [Dolibarr/dolibarr] b99623: fix: when agenda is filterd with "todo" event, do ...

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b996237142d6bc26aca90af038e230d1ba8f9054
      
https://github.com/Dolibarr/dolibarr/commit/b996237142d6bc26aca90af038e230d1ba8f9054
  Author: florian HENRY <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php

  Log Message:
  -----------
  fix: when agenda is filterd with "todo" event, do not display "not
applicable" event


  Commit: 7eaa2011ba6ed75919221d49eeb4cf0e34eff1e0
      
https://github.com/Dolibarr/dolibarr/commit/7eaa2011ba6ed75919221d49eeb4cf0e34eff1e0
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php

  Log Message:
  -----------
  Merge pull request #8900 from atm-florian/6.0_fixagenda

fix: when agenda is filterd with "todo" event, do not display "not applicable" 
event


  Commit: de2ffa11224fada820b9f87cc90988b7da1d5f70
      
https://github.com/Dolibarr/dolibarr/commit/de2ffa11224fada820b9f87cc90988b7da1d5f70
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/comm/action/list.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php

  Log Message:
  -----------
  Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0

Conflicts:
        htdocs/comm/action/listactions.php


  Commit: 3368e35502afb4560b4bf549d7b4c9a17e7b9852
      
https://github.com/Dolibarr/dolibarr/commit/3368e35502afb4560b4bf549d7b4c9a17e7b9852
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0


Compare: 
https://github.com/Dolibarr/dolibarr/compare/840330deeac1...3368e35502af
      **NOTE:** This service 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.