[Dolibarr-git] [Dolibarr/dolibarr] 619e0d: FIX Bad var for substitution of free text

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 619e0d3792920887e42d2d748cd9310537df9a02
      
https://github.com/Dolibarr/dolibarr/commit/619e0d3792920887e42d2d748cd9310537df9a02
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

  Changed paths:
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

  Log Message:
  -----------
  FIX Bad var for substitution of free text


  Commit: a5b1f114c2a88a3438a3ec3fb35697686f528ca2
      
https://github.com/Dolibarr/dolibarr/commit/a5b1f114c2a88a3438a3ec3fb35697686f528ca2
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

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

  Log Message:
  -----------
  FIX Generic substitution of constant disabled for sensitive constant


  Commit: 2d252e85e6a1728f2edb456df781c9fab277acf4
      
https://github.com/Dolibarr/dolibarr/commit/2d252e85e6a1728f2edb456df781c9fab277acf4
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/imports/import.php

  Log Message:
  -----------
  FIX Import process must stop after ending line nb to import


  Commit: 6a78ce65e9c0856b7f67cd469cc196bfe7a23e78
      
https://github.com/Dolibarr/dolibarr/commit/6a78ce65e9c0856b7f67cd469cc196bfe7a23e78
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/imports/import.php

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

Conflicts:
        htdocs/imports/import.php


  Commit: 037094cd65d0798d268fb2190a56697cfdfe8d0b
      
https://github.com/Dolibarr/dolibarr/commit/037094cd65d0798d268fb2190a56697cfdfe8d0b
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/imports/import.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dd204947b8ff...037094cd65d0