[Dolibarr-git] [Dolibarr/dolibarr] 419c15: Fix escaping class

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 419c15ee8efd6b7554ff084c3e4f5acb3c62f324
      
https://github.com/Dolibarr/dolibarr/commit/419c15ee8efd6b7554ff084c3e4f5acb3c62f324
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Fix escaping class


  Commit: b81de3570309989fabbfac6ee1208ea960678b89
      
https://github.com/Dolibarr/dolibarr/commit/b81de3570309989fabbfac6ee1208ea960678b89
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/theme/eldy/style.css.php

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

Conflicts:
        htdocs/adherents/class/adherent.class.php
        htdocs/comm/propal/class/propal.class.php
        htdocs/compta/facture/class/facture.class.php
        htdocs/compta/sociales/class/chargesociales.class.php
        htdocs/contrat/class/contrat.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5581e5da7289...b81de3570309