[Dolibarr-git] [Dolibarr/dolibarr] 310298: maj source

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3102981b88774490d4b61b9ad8c9d167f10f9082
      
https://github.com/Dolibarr/dolibarr/commit/3102981b88774490d4b61b9ad8c9d167f10f9082
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    A test/phpunit/CompanyLibTest.php

  Log Message:
  -----------
  maj source


  Commit: b3504977b0cf4acb4e4090c483db662714302f70
      
https://github.com/Dolibarr/dolibarr/commit/b3504977b0cf4acb4e4090c483db662714302f70
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  #5224 Adding "Copyof" before invoice label to remind user to change it
and avoid label to be the label of cloned invoice


  Commit: 0f14f5a86fb450cc4432de204d35e764064b0ec4
      
https://github.com/Dolibarr/dolibarr/commit/0f14f5a86fb450cc4432de204d35e764064b0ec4
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    R test/phpunit/CompanyLibTest.php

  Log Message:
  -----------
  supp


  Commit: 0d115e0ed04cdae465414fcfb68c9177655db987
      
https://github.com/Dolibarr/dolibarr/commit/0d115e0ed04cdae465414fcfb68c9177655db987
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/admin/multicurrency.php
    M htdocs/comm/propal/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    A htdocs/langs/en_US/multicurrency.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/multicurrency/class/multicurrency.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/develop' into devcamp2


  Commit: 6873e7afecc1d4452615516737b03cf0feb6d4f6
      
https://github.com/Dolibarr/dolibarr/commit/6873e7afecc1d4452615516737b03cf0feb6d4f6
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Revert "#5224 Adding "Copyof" before invoice label to remind user to change 
it and avoid label to be the label of cloned invoice "

This reverts commit b3504977b0cf4acb4e4090c483db662714302f70.


  Commit: 6fffc22466bb27f033bb32b498767a9c65b815c7
      
https://github.com/Dolibarr/dolibarr/commit/6fffc22466bb27f033bb32b498767a9c65b815c7
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/admin/receiptprinter.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bookmarks.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/develop' into devcamp2


  Commit: 918ba71e7f7ea0b11b1672cc3ccda64b790c0227
      
https://github.com/Dolibarr/dolibarr/commit/918ba71e7f7ea0b11b1672cc3ccda64b790c0227
  Author: jean <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  FIX #5014
if $user is admin and different from $object then nbadmin >=1 is ok when
not in multicompany


  Commit: e069d7c23a5db03a72315599add4799d5c564f32
      
https://github.com/Dolibarr/dolibarr/commit/e069d7c23a5db03a72315599add4799d5c564f32
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #5287 from tiaris/devcamp2

Can not modifiy a non admin user to admin (#5014)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c59c86e64889...e069d7c23a5d