[Dolibarr-git] [Dolibarr/dolibarr] 41a2ce: Fix: [ bug #1319 ] Erreur d'affichage des remises ...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 41a2ce1a7416c1dea4c39b1b8d1292bdbdbb3932
      
https://github.com/Dolibarr/dolibarr/commit/41a2ce1a7416c1dea4c39b1b8d1292bdbdbb3932
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M htdocs/comm/fiche.php
    M htdocs/comm/propal.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales

Conflicts:
        htdocs/comm/propal.php


  Commit: 3bc63c43dc0c0f4d47d26b040490d370dc0221ba
      
https://github.com/Dolibarr/dolibarr/commit/3bc63c43dc0c0f4d47d26b040490d370dc0221ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M 
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

  Log Message:
  -----------
  Fix: [ bug #1322 ] notification d'erreur en insérant ou supprimer un
tiers dans une catégorie


  Commit: 6f47e2e1541f708bcebbc4b315404f573e2e2981
      
https://github.com/Dolibarr/dolibarr/commit/6f47e2e1541f708bcebbc4b315404f573e2e2981
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M test/.gitignore

  Log Message:
  -----------
  Ignore file


Compare: 
https://github.com/Dolibarr/dolibarr/compare/90f5f0823f9e...6f47e2e1541f