[Dolibarr-git] [Dolibarr/dolibarr] 87b9d0: Fix element page on project

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 87b9d0412cd162ec0601876f978fba59082a36ab
      
https://github.com/Dolibarr/dolibarr/commit/87b9d0412cd162ec0601876f978fba59082a36ab
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Fix element page on project


  Commit: 2a16a562d9202fa963a68409416bb83da57fa005
      
https://github.com/Dolibarr/dolibarr/commit/2a16a562d9202fa963a68409416bb83da57fa005
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

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

Conflicts:
        ChangeLog


  Commit: 13da9c368e02a2f22736f37e8559f2de68417c50
      
https://github.com/Dolibarr/dolibarr/commit/13da9c368e02a2f22736f37e8559f2de68417c50
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge pull request #1615 from FHenry/3.5

3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4a7e9e4d0b97...13da9c368e02