[Dolibarr-git] [Dolibarr/dolibarr] 73d3cc: New : merge categories while merging thirdparties

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 73d3cc7ce36c95cffd3d700ef1ba492ac71e5c79
      
https://github.com/Dolibarr/dolibarr/commit/73d3cc7ce36c95cffd3d700ef1ba492ac71e5c79
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  New : merge categories while merging thirdparties


  Commit: aa7e9e156a78188dccbebf93046a760d5a826de5
      
https://github.com/Dolibarr/dolibarr/commit/aa7e9e156a78188dccbebf93046a760d5a826de5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-05 (Sun, 05 Nov 2017)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge pull request #7762 from atm-maxime/new_socmerge_cat

NEW merge categories while merging thirdparties


Compare: 
https://github.com/Dolibarr/dolibarr/compare/21a0f11395ac...aa7e9e156a78