[Dolibarr/dolibarr] 545513: FIX : We want to be able to import data for extraf...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5455130a03293088c8d46d68bdfba780e32b4abb
      
https://github.com/Dolibarr/dolibarr/commit/5455130a03293088c8d46d68bdfba780e32b4abb
  Author: gauthier <address@hidden>
  Date:   2020-01-13 (Mon, 13 Jan 2020)

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

  Log Message:
  -----------
  FIX : We want to be able to import data for extrafields of entity 0 too


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

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 10.0.7


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

  Changed paths:
    M build/debian/conf.php.install
    M build/exe/doliwamp/doliwamp.iss
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix distrib in ping


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

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

  Log Message:
  -----------
  Merge pull request #12839 from 
atm-gauthier/10.0_fix_importSocieteWithExtrafields

FIX : We want to be able to import data for extrafields of entity 0 too


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

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modSociete.class.php

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

Conflicts:
        htdocs/core/modules/modSociete.class.php
        htdocs/filefunc.inc.php


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

  Changed paths:
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix duplicate info


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

  Changed paths:
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Fix date format


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

  Changed paths:
    M htdocs/projet/ganttview.php

  Log Message:
  -----------
  Fix date format


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

  Changed paths:
    M build/debian/conf.php.install
    M build/exe/doliwamp/doliwamp.iss
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/main.inc.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php

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

Conflicts:
        htdocs/projet/tasks/time.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/486bb5cd0b46...34829644edae