[Dolibarr-git] [Dolibarr/dolibarr] be2e15: Merge branch '3.1' of https://address@hidden/Doli...

[Laurent Destailleur]

  Branch: refs/heads/3.1
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: be2e150026b082e36a7f5ed59de1f57d3d7fdcd9
      
https://github.com/Dolibarr/dolibarr/commit/be2e150026b082e36a7f5ed59de1f57d3d7fdcd9
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M htdocs/compta/facture.php

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


  Commit: 7d3a2e4ad856a52a66140a38214ae28ed6196d6c
      
https://github.com/Dolibarr/dolibarr/commit/7d3a2e4ad856a52a66140a38214ae28ed6196d6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M htdocs/comm/mailing/fiche.php
  M htdocs/lib/files.lib.php

  Log Message:
  -----------
  Fix: [ bug #236 ] Can't attach a file to e-mailings
(cherry picked from commit 311f013289f07e38bd2eb2e46fca2b42aa7118db)

Conflicts:

        htdocs/comm/mailing/fiche.php
        htdocs/lib/files.lib.php


  Commit: 7108fbda6f45c2d697395478aa6aec40455b6bb7
      
https://github.com/Dolibarr/dolibarr/commit/7108fbda6f45c2d697395478aa6aec40455b6bb7
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Add test to avoid bad input


  Commit: 27e6f9a2778e68812e153ee3306e9511e63d52e4
      
https://github.com/Dolibarr/dolibarr/commit/27e6f9a2778e68812e153ee3306e9511e63d52e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  Fix: duplicate assignement


Compare: https://github.com/Dolibarr/dolibarr/compare/fb99609...27e6f9a