[Dolibarr-git] [Dolibarr/dolibarr] 2cedcf: FIX bug margin calcul by user with multicompany

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2cedcfece2c3a9f41c5385176e6e66d72969dd55
      
https://github.com/Dolibarr/dolibarr/commit/2cedcfece2c3a9f41c5385176e6e66d72969dd55
  Author: arnaud <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php

  Log Message:
  -----------
  FIX bug margin calcul by user with multicompany


  Commit: a47f3cb0e59d6d0ff7a35e7d2ac90ea77470ac1e
      
https://github.com/Dolibarr/dolibarr/commit/a47f3cb0e59d6d0ff7a35e7d2ac90ea77470ac1e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php

  Log Message:
  -----------
  Merge pull request #6309 from 
atm-arnaud/FIX_calcul_marge_by_user_with_multicompany

FIX bug margin calcul by user with multicompany


  Commit: 9ebe383beb7a8273be10389ce5d9eb51bbc91c2d
      
https://github.com/Dolibarr/dolibarr/commit/9ebe383beb7a8273be10389ce5d9eb51bbc91c2d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php

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


  Commit: eb09519a26a44c10d42445fed6bc65745b06a030
      
https://github.com/Dolibarr/dolibarr/commit/eb09519a26a44c10d42445fed6bc65745b06a030
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/03c1521cdeb5...eb09519a26a4