[Dolibarr-git] [Dolibarr/dolibarr] 6966a8: Merge branch '9.0' of address@hidden:Dolibarr/doli...

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6966a854b01d71dd121e4a0f6733f1a04e218f79
      
https://github.com/Dolibarr/dolibarr/commit/6966a854b01d71dd121e4a0f6733f1a04e218f79
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/fourn/facture/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks/time.php

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

Conflicts:
        htdocs/projet/tasks/time.php


  Commit: 4f2d6367b81790afe639fe6339af27d453676de0
      
https://github.com/Dolibarr/dolibarr/commit/4f2d6367b81790afe639fe6339af27d453676de0
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/card.php

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

Conflicts:
        htdocs/projet/tasks/time.php


  Commit: 4acc48eec90adb9dc9e4ce97a661c69c3df6bdd6
      
https://github.com/Dolibarr/dolibarr/commit/4acc48eec90adb9dc9e4ce97a661c69c3df6bdd6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/admin/mails_emailing.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/sms.php
    M htdocs/bom/bom_card.php
    M htdocs/cashdesk/css/style.css
    A htdocs/compta/accounting-files.php
    R htdocs/compta/compta-files.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/expensereport/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/holiday/card.php
    M htdocs/holiday/list.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/opensurvey/results.php
    M htdocs/opensurvey/wizard/choix_date.php
    M htdocs/opensurvey/wizard/create_survey.php
    M htdocs/product/admin/product_tools.php
    M htdocs/theme/eldy/btn.inc.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/md/style.css.php

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


  Commit: 3b69fe1707f47340773f5022601d50f6ae939256
      
https://github.com/Dolibarr/dolibarr/commit/3b69fe1707f47340773f5022601d50f6ae939256
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/societe/class/societeaccount.class.php
    M htdocs/stripe/class/stripe.class.php

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


  Commit: f1d64ad164152252a9cb901a966493e6b82aeb1a
      
https://github.com/Dolibarr/dolibarr/commit/f1d64ad164152252a9cb901a966493e6b82aeb1a
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/comm/action/peruser.php

  Log Message:
  -----------
  Update peruser.php


  Commit: 23b0263ad96a9603aa977a67ec87ee3efc28ae15
      
https://github.com/Dolibarr/dolibarr/commit/23b0263ad96a9603aa977a67ec87ee3efc28ae15
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-20 (Thu, 20 Jun 2019)

  Changed paths:
    M htdocs/comm/action/peruser.php

  Log Message:
  -----------
  Merge pull request #11357 from frederic34/patch-8

avoid countable error


Compare: 
https://github.com/Dolibarr/dolibarr/compare/daab58974e9b...23b0263ad96a