[Dolibarr-git] [Dolibarr/dolibarr] 29a1ae: Merge pull request #83 from simnandez/7d9b5a7545e8...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 29a1ae17ac1057d1d8943feffe2a8ab7355306cf
      
https://github.com/Dolibarr/dolibarr/commit/29a1ae17ac1057d1d8943feffe2a8ab7355306cf
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-01-03 (Tue, 03 Jan 2012)

  Changed paths:
    A htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
  A htdocs/core/modules/propale/doc/pdf_azur.modules.php
  A htdocs/core/modules/propale/doc/pdf_jaune.modules.php
  R htdocs/core/modules/propale/doc_generic_proposal_odt.modules.php
  M htdocs/core/modules/propale/modules_propale.php
  R htdocs/core/modules/propale/pdf_propale_azur.modules.php
  R htdocs/core/modules/propale/pdf_propale_jaune.modules.php

  Log Message:
  -----------
  Merge pull request #83 from simnandez/7d9b5a7545e811cc0822645e7eff729a28b1142a

[ task #176 ] Allow to use ODT templates for prososal like it's done  for 
invoices. Move pdf and odt to doc dir