[Dolibarr-git] [Dolibarr/dolibarr] ef0517: Fix : contract service list context was mixing up ...

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ef051716410fcb7eef18447f6facc1086924beec
      
https://github.com/Dolibarr/dolibarr/commit/ef051716410fcb7eef18447f6facc1086924beec
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M htdocs/contrat/services.php

  Log Message:
  -----------
  Fix : contract service list context was mixing up with service list from 
product/service module


  Commit: 94a76a1393d1bbfab818fb50b5f8c86433a20014
      
https://github.com/Dolibarr/dolibarr/commit/94a76a1393d1bbfab818fb50b5f8c86433a20014
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M htdocs/contrat/services.php

  Log Message:
  -----------
  Merge pull request #8180 from atm-maxime/fix_service_list

Fix : contract service list context was mixing up with service list from 
product/service module


  Commit: b21feca9d7a69f0d2599637f8b93a231a19d259c
      
https://github.com/Dolibarr/dolibarr/commit/b21feca9d7a69f0d2599637f8b93a231a19d259c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M htdocs/contrat/services.php

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


  Commit: 15ab37b46e872cdc6102fb22f0379353280704cd
      
https://github.com/Dolibarr/dolibarr/commit/15ab37b46e872cdc6102fb22f0379353280704cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/type.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/install.lang
    M htdocs/product/fournisseurs.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/147b35d62e4e...15ab37b46e87