[Dolibarr/dolibarr] 10c973: Fix complex export model loading

[Laurent Destailleur]

  Branch: refs/heads/11.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 10c973f38f98e08587f2d7735f584e12ce22ebed
      
https://github.com/Dolibarr/dolibarr/commit/10c973f38f98e08587f2d7735f584e12ce22ebed
  Author: John Botella <address@hidden>
  Date:   2020-01-15 (Wed, 15 Jan 2020)

  Changed paths:
    M htdocs/exports/export.php

  Log Message:
  -----------
  Fix complex export model loading


  Commit: 536f835a3ee737973a572aedc3e82b2ce83aabfe
      
https://github.com/Dolibarr/dolibarr/commit/536f835a3ee737973a572aedc3e82b2ce83aabfe
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-15 (Wed, 15 Jan 2020)

  Changed paths:
    M htdocs/exports/export.php

  Log Message:
  -----------
  Merge pull request #12850 from atm-john/10.0_fix_export_explode

FIX complex export model loading


  Commit: 3cdb84b192bd5ea8c4f6c66eabc2f19215dee08e
      
https://github.com/Dolibarr/dolibarr/commit/3cdb84b192bd5ea8c4f6c66eabc2f19215dee08e
  Author: atm-ph <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

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

  Log Message:
  -----------
  Fix note started with <s> balise


  Commit: 60d4f63205a0c8d03bfdf96825f0a5b1894f5ab3
      
https://github.com/Dolibarr/dolibarr/commit/60d4f63205a0c8d03bfdf96825f0a5b1894f5ab3
  Author: VESSILLER <address@hidden>
  Date:   2020-01-17 (Fri, 17 Jan 2020)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/langs/fr_FR/trips.lang

  Log Message:
  -----------
  FIX send expense report mail in HTML format


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

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/langs/fr_FR/trips.lang

  Log Message:
  -----------
  Merge pull request #12879 from OPEN-DSI/v10-fix-expense-report-mail

FIX send expense report mail in HTML format


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

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

  Log Message:
  -----------
  Merge pull request #12860 from atm-ph/fix_10.0_html_text

Fix note started with <s> balise


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

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

  Log Message:
  -----------
  Fix error return when creating order with not enough stock


  Commit: 8bc8a8f57caeeaf5ea3d67203faf71b0551417b8
      
https://github.com/Dolibarr/dolibarr/commit/8bc8a8f57caeeaf5ea3d67203faf71b0551417b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-19 (Sun, 19 Jan 2020)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/expensereport/card.php
    M htdocs/exports/export.php
    M htdocs/langs/fr_FR/trips.lang

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


  Commit: 00cddc39fd33b0d6685f04143ebeec3a5a9d9622
      
https://github.com/Dolibarr/dolibarr/commit/00cddc39fd33b0d6685f04143ebeec3a5a9d9622
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-19 (Sun, 19 Jan 2020)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix remove some orphelins in llx_ecm_files


  Commit: 6a958dd45b9fbb0a47c2254253344526408edace
      
https://github.com/Dolibarr/dolibarr/commit/6a958dd45b9fbb0a47c2254253344526408edace
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-19 (Sun, 19 Jan 2020)

  Changed paths:
    M htdocs/admin/tools/listevents.php

  Log Message:
  -----------
  FIX XSS vulnerability in description of list of audit events.


  Commit: 041d5aeb463b9638a11ec3b0f477c104aa6b43cb
      
https://github.com/Dolibarr/dolibarr/commit/041d5aeb463b9638a11ec3b0f477c104aa6b43cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-19 (Sun, 19 Jan 2020)

  Changed paths:
    M htdocs/admin/tools/listevents.php

  Log Message:
  -----------
  FIX XSS vulnerability in description of list of audit events.


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

  Changed paths:
    M htdocs/admin/tools/listevents.php
    M htdocs/commande/class/commande.class.php
    M htdocs/expensereport/card.php
    M htdocs/exports/export.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/fr_FR/trips.lang

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

Conflicts:
        htdocs/admin/tools/listevents.php
        htdocs/commande/class/commande.class.php
        htdocs/core/lib/functions.lib.php
        htdocs/expensereport/card.php
        htdocs/exports/export.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8c8d492a48d3...e803e06c0dd6