[Dolibarr-git] [Dolibarr/dolibarr] 8ccb58: Fix: Change for php 5.6

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8ccb5811858da0fb7111c43a9108b34be6770bb3
      
https://github.com/Dolibarr/dolibarr/commit/8ccb5811858da0fb7111c43a9108b34be6770bb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang

  Log Message:
  -----------
  Fix: Change for php 5.6
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.


  Commit: e0aa140960c0714889e784c9f24f07d2a3849fde
      
https://github.com/Dolibarr/dolibarr/commit/e0aa140960c0714889e784c9f24f07d2a3849fde
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M htdocs/admin/contract.php
    M htdocs/admin/propal.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
    A htdocs/core/modules/project/doc/index.html
    A htdocs/core/modules/project/doc/pdf_baleine.modules.php
    R htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    R htdocs/core/modules/project/pdf/index.html
    R htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    A htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    A htdocs/core/modules/project/task/doc/index.html
    R htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
    R htdocs/core/modules/project/task/pdf/index.html
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/projet/admin/project.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M test/phpunit/BuildDocTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f1f4fc18e9ca...e0aa140960c0