[Dolibarr-git] [Dolibarr/dolibarr] 4af26c: fetch object in include file

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4af26c119faa512590faad44e296b64b6c9e1978
      
https://github.com/Dolibarr/dolibarr/commit/4af26c119faa512590faad44e296b64b6c9e1978
  Author: frederic34 <address@hidden>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M htdocs/commande/card.php
    A htdocs/core/actions_fetchobject.inc.php
    M htdocs/expedition/card.php
    M htdocs/includes/tcpdi/fpdf_tpl.php
    M htdocs/projet/card.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  fetch object in include file


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

  Changed paths:
    M htdocs/commande/card.php
    A htdocs/core/actions_fetchobject.inc.php
    M htdocs/expedition/card.php
    M htdocs/includes/tcpdi/fpdf_tpl.php
    M htdocs/projet/card.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr
into develop

Conflicts:
        htdocs/includes/tcpdi/fpdf_tpl.php
        htdocs/projet/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4a9a96316d21...09035c1feec3