[Dolibarr-git] [Dolibarr/dolibarr] 20471c: Fix import code (regex of data imported + import o...

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 20471c54e1a24c4cf4de1d387ca6c8df16da2b14
      
https://github.com/Dolibarr/dolibarr/commit/20471c54e1a24c4cf4de1d387ca6c8df16da2b14
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-25 (Tue, 25 Jun 2019)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/import/import_xlsx.modules.php

  Log Message:
  -----------
  Fix import code (regex of data imported + import of constant)

Conflicts:
        htdocs/core/modules/import/import_csv.modules.php
        htdocs/core/modules/import/import_xlsx.modules.php


  Commit: ad725b3bb065df9adf5fa6374865d0f303c96aad
      
https://github.com/Dolibarr/dolibarr/commit/ad725b3bb065df9adf5fa6374865d0f303c96aad
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-25 (Tue, 25 Jun 2019)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Doc


  Commit: d5479cd9ae41484b4a818ec56e179b0564c88b5d
      
https://github.com/Dolibarr/dolibarr/commit/d5479cd9ae41484b4a818ec56e179b0564c88b5d
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-25 (Tue, 25 Jun 2019)

  Changed paths:
    M htdocs/core/modules/modAccounting.class.php

  Log Message:
  -----------
  Fix import of ledger


  Commit: 67909302834bc9d4f5ce4a5903f5272fa1cae76a
      
https://github.com/Dolibarr/dolibarr/commit/67909302834bc9d4f5ce4a5903f5272fa1cae76a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-25 (Tue, 25 Jun 2019)

  Changed paths:
    M build/generate_filelist_xml.php

  Log Message:
  -----------
  Add info on signature generator


  Commit: 7a0962a3935d5434fcf300fce58dd14820e89416
      
https://github.com/Dolibarr/dolibarr/commit/7a0962a3935d5434fcf300fce58dd14820e89416
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-25 (Tue, 25 Jun 2019)

  Changed paths:
    M ChangeLog
    M build/generate_filelist_xml.php
    M htdocs/core/modules/modAccounting.class.php

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

Conflicts:
        htdocs/core/modules/modAccounting.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/83f5b23ade29...7a0962a3935d