[Dolibarr-git] [Dolibarr/dolibarr] bf9ec2: Fix: Clean init data

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bf9ec22cd0f4d4fad618ce3f2dc256b586b7893e
      
https://github.com/Dolibarr/dolibarr/commit/bf9ec22cd0f4d4fad618ce3f2dc256b586b7893e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.4.0.sql

  Log Message:
  -----------
  Fix: Clean init data


  Commit: a49bce10dec8ff7f1fa15f890519400a6e8166e7
      
https://github.com/Dolibarr/dolibarr/commit/a49bce10dec8ff7f1fa15f890519400a6e8166e7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/projet/activity/list.php

  Log Message:
  -----------
  Fix: When disabled, all fields must be disabled. Need backport.

Conflicts:
        htdocs/projet/activity/list.php


  Commit: 48fc945648adf06d77caa997d3d07a145ee4cfaf
      
https://github.com/Dolibarr/dolibarr/commit/48fc945648adf06d77caa997d3d07a145ee4cfaf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/activity/list.php

  Log Message:
  -----------
  Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.

Conflicts:
        htdocs/core/lib/project.lib.php
        htdocs/projet/activity/list.php


  Commit: d0c3a7913f9c0d42acc2dfa1541babecc9e6d41e
      
https://github.com/Dolibarr/dolibarr/commit/d0c3a7913f9c0d42acc2dfa1541babecc9e6d41e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.


  Commit: 8c728ac63824f4f388d1447de7437d2c4e3252f4
      
https://github.com/Dolibarr/dolibarr/commit/8c728ac63824f4f388d1447de7437d2c4e3252f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: bad regex syntax


  Commit: de76fe4951f60268eec2c1c72bebba3abc64f89e
      
https://github.com/Dolibarr/dolibarr/commit/de76fe4951f60268eec2c1c72bebba3abc64f89e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: Missing join into request.

Conflicts:
        htdocs/compta/facture.php


  Commit: 159d0c70578e99a0cabdb2634913fcc05eba7973
      
https://github.com/Dolibarr/dolibarr/commit/159d0c70578e99a0cabdb2634913fcc05eba7973
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

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

  Log Message:
  -----------
  Fix: get_full_tree was not working correctly.


  Commit: e8ffb0dacf7ec142af7dbdbd1035dbe56ea928a7
      
https://github.com/Dolibarr/dolibarr/commit/e8ffb0dacf7ec142af7dbdbd1035dbe56ea928a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Fix: sql error on editing project with pgsql.
Fix: Error management on project edit.


  Commit: c52794ce7f06c7ffadbb2ef1927117137de0f2d5
      
https://github.com/Dolibarr/dolibarr/commit/c52794ce7f06c7ffadbb2ef1927117137de0f2d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        htdocs/projet/class/project.class.php


  Commit: 91aabbb40e766c8809e96dce4219e26e67a549f4
      
https://github.com/Dolibarr/dolibarr/commit/91aabbb40e766c8809e96dce4219e26e67a549f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/activity/list.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/compta/facture.php
        htdocs/core/lib/project.lib.php
        htdocs/main.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/69888aa569c1...91aabbb40e76