[Dolibarr-git] [Dolibarr/dolibarr] b28c4d: Fix: [ bug #3180 ] formObjectOptions hook when edi...

[Laurent Destailleur]

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

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

  Log Message:
  -----------
  Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does 
not print result

Close #3180


  Commit: 538c8c072b989eb90c16557ad612ce0efdbf632e
      
https://github.com/Dolibarr/dolibarr/commit/538c8c072b989eb90c16557ad612ce0efdbf632e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-3180

Conflicts:
        ChangeLog


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

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

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

Conflicts:
        ChangeLog


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

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/739eaedecc73...5c2059a79f60