[Dolibarr-git] [Dolibarr/dolibarr] b62be8: Fix: Test table llx_expedition to allow delete of ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b62be8dd0ba23d11162e0d39efe6d9cb4732b869
      
https://github.com/Dolibarr/dolibarr/commit/b62be8dd0ba23d11162e0d39efe6d9cb4732b869
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

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

  Log Message:
  -----------
  Fix: Test table llx_expedition to allow delete of thirdparty


  Commit: 6317cb53f20752ab27b7e8f93012180e20c8a29c
      
https://github.com/Dolibarr/dolibarr/commit/6317cb53f20752ab27b7e8f93012180e20c8a29c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  FIX Merge of 2 thirdparties when there is one common tag.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/195fcc5653b9...6317cb53f207