[Dolibarr-git] [Dolibarr/dolibarr] 77c09d: Fix: [ bug #1407 ] Rouget pdf overlapped when usin...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 77c09d887acf2ffd3bb1cbd182fa69ed8442d573
      
https://github.com/Dolibarr/dolibarr/commit/77c09d887acf2ffd3bb1cbd182fa69ed8442d573
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and 
public notes


  Commit: 9cc74c36d272391e90bf566779ca3ba22812a822
      
https://github.com/Dolibarr/dolibarr/commit/9cc74c36d272391e90bf566779ca3ba22812a822
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Missing copyright info


  Commit: 2771c506e9fb9c2c444fe332cc4049a8c02e929a
      
https://github.com/Dolibarr/dolibarr/commit/2771c506e9fb9c2c444fe332cc4049a8c02e929a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1407

Conflicts:
        ChangeLog


  Commit: df35b4d2eae56e76f95e2e0bcf9ed0622cf0dc6f
      
https://github.com/Dolibarr/dolibarr/commit/df35b4d2eae56e76f95e2e0bcf9ed0622cf0dc6f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1407' into 3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/31ea7117f049...df35b4d2eae5