[Dolibarr-git] [Dolibarr/dolibarr] 3d6c5b: Fix: [ bug #3268 ] SQL error when accessing thirdp...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3d6c5b09e83f99ccf1466c8143ff47c9fcdf6680
      
https://github.com/Dolibarr/dolibarr/commit/3d6c5b09e83f99ccf1466c8143ff47c9fcdf6680
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

  Log Message:
  -----------
  Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a 
socid parameter

Close #3268


  Commit: 4100026c7195b2d3432690c8094b0c01daae6906
      
https://github.com/Dolibarr/dolibarr/commit/4100026c7195b2d3432690c8094b0c01daae6906
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

  Log Message:
  -----------
  Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3268

Conflicts:
        ChangeLog


  Commit: 739eaedecc7320aad414127836c197af9e642cfb
      
https://github.com/Dolibarr/dolibarr/commit/739eaedecc7320aad414127836c197af9e642cfb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-3268' into 3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8d7c1f8d4cec...739eaedecc73