[Dolibarr-git] [Dolibarr/dolibarr] 0c6364: Fix: [ bug #1819 ] SQL error when searching for an...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0c6364403850cb293ed92b9e1906a58b2f70862e
      
https://github.com/Dolibarr/dolibarr/commit/0c6364403850cb293ed92b9e1906a58b2f70862e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1819 ] SQL error when searching for an invoice payment


  Commit: fd93e9f322f2c91d25f454d901f5be63370de8f3
      
https://github.com/Dolibarr/dolibarr/commit/fd93e9f322f2c91d25f454d901f5be63370de8f3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1812' into 3.6


  Commit: 3bb6a5e8aff68b3984299afc8f194a79d68c8f26
      
https://github.com/Dolibarr/dolibarr/commit/3bb6a5e8aff68b3984299afc8f194a79d68c8f26
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/liste.php

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3ad61e4dc8e3...3bb6a5e8aff6