[Dolibarr-git] [Dolibarr/dolibarr] 04e933: Fix : admin ODT doctemplate path commande/project

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 04e933c40f9f9b7e474a4f2d75c9969f2699cc4a
      
https://github.com/Dolibarr/dolibarr/commit/04e933c40f9f9b7e474a4f2d75c9969f2699cc4a
  Author: fhenry <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/project.php

  Log Message:
  -----------
  Fix : admin ODT doctemplate path commande/project


  Commit: 2ca18ace30ec44c2af2537a1113eeea02c88e1b2
      
https://github.com/Dolibarr/dolibarr/commit/2ca18ace30ec44c2af2537a1113eeea02c88e1b2
  Author: fhenry <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    A htdocs/admin/supplierinvoice_extrafields.php
    M htdocs/admin/supplierorder_extrafields.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/suppliers.lang
    M scripts/members/sync_members_ldap2dolibarr.php

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


  Commit: 607dc9caa790e79e1d1f219a9930e3f16fcb883b
      
https://github.com/Dolibarr/dolibarr/commit/607dc9caa790e79e1d1f219a9930e3f16fcb883b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/project.php

  Log Message:
  -----------
  Merge pull request #819 from FHenry/develop

Fix : admin ODT doctemplate path commande/project


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2ab5c2029d13...607dc9caa790