[Dolibarr-git] [Dolibarr/dolibarr] fe5467: FIX List of people able to validate an expense rep...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fe54673a87157ba4461bab8d942bd9a0a6732b3e
      
https://github.com/Dolibarr/dolibarr/commit/fe54673a87157ba4461bab8d942bd9a0a6732b3e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  FIX List of people able to validate an expense report was not complete.


  Commit: 80f2623f9f66ec21ec10e48817007ac8840025f4
      
https://github.com/Dolibarr/dolibarr/commit/80f2623f9f66ec21ec10e48817007ac8840025f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/index.php

  Log Message:
  -----------
  FIX bad permission to see contract on home page


  Commit: b0ac0624dbf8769ebb1280fd59967f862fcc63a4
      
https://github.com/Dolibarr/dolibarr/commit/b0ac0624dbf8769ebb1280fd59967f862fcc63a4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  FIX bad permission to see contract statistics


  Commit: 6e5a8b6787a12ee0ce4b5f48d10e1d1ded0e9fa7
      
https://github.com/Dolibarr/dolibarr/commit/6e5a8b6787a12ee0ce4b5f48d10e1d1ded0e9fa7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php
    M htdocs/expensereport/class/expensereportstats.class.php

  Log Message:
  -----------
  FIX Some statistics not compatible with multicompany module.


  Commit: 9c47f3d3fdc9ca64df9dd95c0ec197eca3280e64
      
https://github.com/Dolibarr/dolibarr/commit/9c47f3d3fdc9ca64df9dd95c0ec197eca3280e64
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/expensereport/class/expensereportstats.class.php

  Log Message:
  -----------
  Restore protection to avoid errors


  Commit: 4abd417a6adf0a4713dccb9417ffabb41ce8bbb3
      
https://github.com/Dolibarr/dolibarr/commit/4abd417a6adf0a4713dccb9417ffabb41ce8bbb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-03 (Sat, 03 Dec 2016)

  Changed paths:
    M htdocs/expensereport/class/expensereportstats.class.php

  Log Message:
  -----------
  Corrupted data must be fixed by repair not by code hack.


  Commit: 0d7ab3301bfd0b04ca355ac0cf21cebe80cc4196
      
https://github.com/Dolibarr/dolibarr/commit/0d7ab3301bfd0b04ca355ac0cf21cebe80cc4196
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  FIX in export. Error when using a separate extrafields.


  Commit: cfff6a8cb80aafcf8981bbba39694924ce837215
      
https://github.com/Dolibarr/dolibarr/commit/cfff6a8cb80aafcf8981bbba39694924ce837215
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M htdocs/core/modules/modProjet.class.php
    M htdocs/projet/card.php

  Log Message:
  -----------
  FIX Export of opportunity status must be code, not id.


  Commit: db9af0118c8d84e2da6c7789d9ac1b1971507f35
      
https://github.com/Dolibarr/dolibarr/commit/db9af0118c8d84e2da6c7789d9ac1b1971507f35
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/index.php
    M htdocs/projet/card.php

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

Conflicts:
        htdocs/core/modules/modAdherent.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/017e384f16c0...db9af0118c8d