[Dolibarr-git] [Dolibarr/dolibarr] dd1c5c: Fix: Missing commit

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dd1c5ce3d833fb86222a450000bb64daad7175d7
      
https://github.com/Dolibarr/dolibarr/commit/dd1c5ce3d833fb86222a450000bb64daad7175d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Fix: Missing commit


  Commit: 198a8d40f7f95cd6b15d283170d6398d7b2883ba
      
https://github.com/Dolibarr/dolibarr/commit/198a8d40f7f95cd6b15d283170d6398d7b2883ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php

  Log Message:
  -----------
  Fix: Missing translation


  Commit: 14de1d66c052d21d24cfab8240d2b9707f247e9f
      
https://github.com/Dolibarr/dolibarr/commit/14de1d66c052d21d24cfab8240d2b9707f247e9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/fourn/class/fournisseur.commande.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/02f4016b7b59...14de1d66c052