[Dolibarr-git] [Dolibarr/dolibarr] cf3190: Bad error management

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cf3190a4ef6bdca7286d6f465bf3575396860d39
      
https://github.com/Dolibarr/dolibarr/commit/cf3190a4ef6bdca7286d6f465bf3575396860d39
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

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

  Log Message:
  -----------
  Bad error management


  Commit: 13d8f26247c70e1c1992daef588ef95fc56dce4d
      
https://github.com/Dolibarr/dolibarr/commit/13d8f26247c70e1c1992daef588ef95fc56dce4d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M CONTRIBUTING.md
    M ChangeLog
    A htdocs/admin/askpricesupplier.php
    A htdocs/comm/admin/askpricesupplier_extrafields.php
    A htdocs/comm/admin/askpricesupplierdet_extrafields.php
    A htdocs/comm/askpricesupplier/card.php
    A htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    A htdocs/comm/askpricesupplier/class/index.html
    A htdocs/comm/askpricesupplier/document.php
    A htdocs/comm/askpricesupplier/index.php
    A htdocs/comm/askpricesupplier/info.php
    A htdocs/comm/askpricesupplier/list.php
    A htdocs/comm/askpricesupplier/note.php
    A htdocs/comm/askpricesupplier/tpl/index.html
    A htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/propal.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formactions.class.php
    A htdocs/core/class/html.formaskpricesupplier.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    A htdocs/core/lib/askpricesupplier.lib.php
    M htdocs/core/lib/functions2.lib.php
    A 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    A htdocs/core/modules/askpricesupplier/doc/index.html
    A htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    A htdocs/core/modules/askpricesupplier/index.html
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
    A htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
    A htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    A htdocs/core/modules/modAskPriceSupplier.class.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/card.php
    A htdocs/install/doctemplates/askpricesupplier/index.html
    A htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_projet.sql
    M htdocs/langs/en_US/admin.lang
    A htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/fr_FR/admin.lang
    A htdocs/langs/fr_FR/askpricesupplier.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    A htdocs/theme/eldy/img/object_askpricesupplier.png
    M test/phpunit/ProjectTest.php

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1cf39d4c8f52...13d8f26247c7