[Dolibarr-git] [Dolibarr/dolibarr] 14ecdc: Fix merge of thirdparties (pb when merging codes a...

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 14ecdce650c75b12612f3af706792766046cca8d
      
https://github.com/Dolibarr/dolibarr/commit/14ecdce650c75b12612f3af706792766046cca8d
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-31 (Wed, 31 Jan 2018)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/societe/card.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/note.php

  Log Message:
  -----------
  Fix merge of thirdparties (pb when merging codes and error management)