[Dolibarr-git] [Dolibarr/dolibarr] 04424e: FIX Bad label of status for members (must be short...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 04424ed8822a3d5dea2779edf72ca7aa1147ea66
      
https://github.com/Dolibarr/dolibarr/commit/04424ed8822a3d5dea2779edf72ca7aa1147ea66
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-15 (Fri, 15 Mar 2019)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php

  Log Message:
  -----------
  FIX Bad label of status for members (must be short version in list)

Conflicts:
        htdocs/adherents/class/adherent.class.php


  Commit: 68945c7d518dfe27e4cc9ca1a522b02eeca2742f
      
https://github.com/Dolibarr/dolibarr/commit/68945c7d518dfe27e4cc9ca1a522b02eeca2742f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  Fix #10177


  Commit: 21e2d364219b5df2faf78c018246213827fcea0f
      
https://github.com/Dolibarr/dolibarr/commit/21e2d364219b5df2faf78c018246213827fcea0f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/rapport.php

  Log Message:
  -----------
  Fix #9311


  Commit: efeb7b0c223ac958f0a1126453f0a00c5ec026d7
      
https://github.com/Dolibarr/dolibarr/commit/efeb7b0c223ac958f0a1126453f0a00c5ec026d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge pull request #10854 from atm-maxime/fix_civility_third_creation

Fix #10177


  Commit: 55718cc7dac0427af69dceaf90e3dd297457786b
      
https://github.com/Dolibarr/dolibarr/commit/55718cc7dac0427af69dceaf90e3dd297457786b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/rapport.php

  Log Message:
  -----------
  Merge pull request #10855 from atm-maxime/fix_missing_lang

Fix #9311


  Commit: 46b39dd6a97bd802cb97059f4e43060efaa51cf9
      
https://github.com/Dolibarr/dolibarr/commit/46b39dd6a97bd802cb97059f4e43060efaa51cf9
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Fix #9961 : deal with supplier credit note refund like with customers


  Commit: 468af5380fdb84d7c8228039c7ab04b151136a23
      
https://github.com/Dolibarr/dolibarr/commit/468af5380fdb84d7c8228039c7ab04b151136a23
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Merge pull request #10857 from atm-maxime/fix_creditnote_refund

Fix #9961 : deal with supplier credit note refund like with customers


  Commit: 8adc33382340c75ddbb4e23a77754aa212d8374b
      
https://github.com/Dolibarr/dolibarr/commit/8adc33382340c75ddbb4e23a77754aa212d8374b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/facture/rapport.php
    M htdocs/societe/card.php

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


  Commit: dabccb796784c8aefd89a0609694704784c8b090
      
https://github.com/Dolibarr/dolibarr/commit/dabccb796784c8aefd89a0609694704784c8b090
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/facture/rapport.php
    M htdocs/societe/card.php

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

Conflicts:
        htdocs/adherents/class/adherent.class.php
        htdocs/fourn/facture/paiement.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/01cd40d5c615...dabccb796784