[Dolibarr/dolibarr] 423be8: FIX Label of status of social contribution

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 423be8a139984953ce56b98afc12f4bd5a7cf367
      
https://github.com/Dolibarr/dolibarr/commit/423be8a139984953ce56b98afc12f4bd5a7cf367
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/compta/sociales/card.php
    M htdocs/compta/sociales/class/chargesociales.class.php

  Log Message:
  -----------
  FIX Label of status of social contribution


  Commit: a44d534e64a55311a352a739340c4bd22cae5519
      
https://github.com/Dolibarr/dolibarr/commit/a44d534e64a55311a352a739340c4bd22cae5519
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/compta/sociales/class/chargesociales.class.php

  Log Message:
  -----------
  Fix label


  Commit: b74d37338bd1f4638c090e68e727e7f5702d239a
      
https://github.com/Dolibarr/dolibarr/commit/b74d37338bd1f4638c090e68e727e7f5702d239a
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/compta/sociales/card.php

  Log Message:
  -----------
  Fix trans


  Commit: df90e432d4a9ab28ab342c5b974ae2826f8fb5d2
      
https://github.com/Dolibarr/dolibarr/commit/df90e432d4a9ab28ab342c5b974ae2826f8fb5d2
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/compta/sociales/card.php

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

Conflicts:
        htdocs/compta/sociales/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f59cb65a2172...df90e432d4a9