[Dolibarr-git] [Dolibarr/dolibarr] d0ab11: FIX : external user cannot be set as internal

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d0ab117488163894396aa0b9e95cebce50fa7a8b
      
https://github.com/Dolibarr/dolibarr/commit/d0ab117488163894396aa0b9e95cebce50fa7a8b
  Author: jfefe <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  FIX : external user cannot be set as internal


  Commit: 883c9dbf99c28d099496c778d98eba69ad2e8c23
      
https://github.com/Dolibarr/dolibarr/commit/883c9dbf99c28d099496c778d98eba69ad2e8c23
  Author: ptibogxiv <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Fix for multicompany

last fix for multicompany compliance


  Commit: c194538609eae4e167c3f5778e62aeb7dd9c886e
      
https://github.com/Dolibarr/dolibarr/commit/c194538609eae4e167c3f5778e62aeb7dd9c886e
  Author: ptibogxiv <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Update fraise.modules.php


  Commit: f04af6c1b3a4e4b5014cd69ed72a7358b3d1f521
      
https://github.com/Dolibarr/dolibarr/commit/f04af6c1b3a4e4b5014cd69ed72a7358b3d1f521
  Author: gauthier <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/compta/facture/stats/index.php

  Log Message:
  -----------
  FIX : test for filter fk_status


  Commit: dbde97f25f1f120ca042cb75fa337eca83328684
      
https://github.com/Dolibarr/dolibarr/commit/dbde97f25f1f120ca042cb75fa337eca83328684
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Update card.php


  Commit: 359e82fd3e9dc8498982168e378e5813e45fb792
      
https://github.com/Dolibarr/dolibarr/commit/359e82fd3e9dc8498982168e378e5813e45fb792
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #7884 from jfefe/patch-15

FIX : external user cannot be set as internal


  Commit: 9fa6bfd1a597835cfb1f2dcd9350bbd47e6bd0b0
      
https://github.com/Dolibarr/dolibarr/commit/9fa6bfd1a597835cfb1f2dcd9350bbd47e6bd0b0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix edit external user or not


  Commit: acd2d0121dd724889092e0285f79e92d99bb192b
      
https://github.com/Dolibarr/dolibarr/commit/acd2d0121dd724889092e0285f79e92d99bb192b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Merge pull request #7886 from ptibogxiv/patch-8

Fix for multicompany


  Commit: d2135fd139ed6d1a4c69b8cabc5ddd9eee367cc3
      
https://github.com/Dolibarr/dolibarr/commit/d2135fd139ed6d1a4c69b8cabc5ddd9eee367cc3
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M htdocs/compta/facture/stats/index.php

  Log Message:
  -----------
  Merge pull request #7888 from atm-gauthier/5.0_fix_where_fk_status

FIX : test for filter fk_status


  Commit: b7f26ea788c49724069d0c244f9ec91224aed1d7
      
https://github.com/Dolibarr/dolibarr/commit/b7f26ea788c49724069d0c244f9ec91224aed1d7
  Author: root <address@hidden>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  FIX add line bad price and ref


  Commit: b2effa7cc8c93b0495a6209a31bb9b967459fa49
      
https://github.com/Dolibarr/dolibarr/commit/b2effa7cc8c93b0495a6209a31bb9b967459fa49
  Author: Alexis ALGOUD <address@hidden>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  fix travis


  Commit: 5308acdcde629bfb1c27eb1acb93938d84c4c497
      
https://github.com/Dolibarr/dolibarr/commit/5308acdcde629bfb1c27eb1acb93938d84c4c497
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-01 (Fri, 01 Dec 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #7895 from atm-alexis/FIX_add_line_bad_price_and_ref

FIX add line bad price and ref


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

  Changed paths:
    M htdocs/product/class/product.class.php

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

Conflicts:
        htdocs/compta/facture/stats/index.php


  Commit: 1ce155728fb2d9f003d335e1ae60d182430b3875
      
https://github.com/Dolibarr/dolibarr/commit/1ce155728fb2d9f003d335e1ae60d182430b3875
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-01 (Fri, 01 Dec 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/user/card.php

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

Conflicts:
        htdocs/core/modules/mailings/fraise.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c8f661021c24...1ce155728fb2