[Dolibarr-git] [Dolibarr/dolibarr] 942629: [ bug #1548 ] Supplier payment card shows type in ...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9426298b95db766c055bfb39f5e10ebb9990eac9
      
https://github.com/Dolibarr/dolibarr/commit/9426298b95db766c055bfb39f5e10ebb9990eac9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

  Log Message:
  -----------
  [ bug #1548 ] Supplier payment card shows type in French


  Commit: 822a3ebe7ef03ce7f624df0713c52646648a2480
      
https://github.com/Dolibarr/dolibarr/commit/822a3ebe7ef03ce7f624df0713c52646648a2480
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

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

Conflicts:
        ChangeLog


  Commit: e8758bc19bbeeb002cf84912c72aeb2f8f6e4760
      
https://github.com/Dolibarr/dolibarr/commit/e8758bc19bbeeb002cf84912c72aeb2f8f6e4760
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e93d47439366...e8758bc19bbe