[Dolibarr-git] [Dolibarr/dolibarr] a9dc6b: Fix: [ bug #1826 ] Supplier payment types are not ...

[Laurent Destailleur]

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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Fix: [ bug #1826 ] Supplier payment types are not translated in 
fourn/facture/paiement.php


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

  Changed paths:
    M ChangeLog

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc415fc3c918...50142a1e6cdb