[Dolibarr-git] [Dolibarr/dolibarr] 6531a5: Fix: [ bug #1830 ] Salaries payment only allows ch...

[Laurent Destailleur]

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

  Changed paths:
    M ChangeLog
    M htdocs/compta/salaries/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1830 ] Salaries payment only allows checking accounts


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/salaries/fiche.php

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

Conflicts:
        ChangeLog


  Commit: 9ebd79f52858b1928fd884a33c0686009abdd6c8
      
https://github.com/Dolibarr/dolibarr/commit/9ebd79f52858b1928fd884a33c0686009abdd6c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/salaries/fiche.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/231c3f57d306...9ebd79f52858