[Dolibarr-git] [Dolibarr/dolibarr] a4570c: Merge branch '3.1' of ssh://address@hidden/Dolibar...

[Laurent Destailleur]

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

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

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
  M htdocs/core/photos_resize.php
  M htdocs/fourn/commande/fiche.php

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


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

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Fix: [ bug #233 ] Delete invoice problem with a discount


Compare: https://github.com/Dolibarr/dolibarr/compare/6d78f7e...e08e07c