[Dolibarr-git] [Dolibarr/dolibarr] b3d58e: FIX large expense note

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b3d58e95109b615b9e5471f24fdaa36277bb2902
      
https://github.com/Dolibarr/dolibarr/commit/b3d58e95109b615b9e5471f24fdaa36277bb2902
  Author: root <address@hidden>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  FIX large expense note


  Commit: c9d743ac26f9f1dae5d7442166da297e00e42143
      
https://github.com/Dolibarr/dolibarr/commit/c9d743ac26f9f1dae5d7442166da297e00e42143
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  Merge pull request #5330 from atm-alexis/FIX_large_expense_note_and_large_logo

FIX 3.8 large expense note


  Commit: 9b50150fe8d2248fec8414c0ab2fba70802b6719
      
https://github.com/Dolibarr/dolibarr/commit/9b50150fe8d2248fec8414c0ab2fba70802b6719
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX #5380


  Commit: d78eb4495e6dbe2b1a81ee870dd03732b1bfa8b8
      
https://github.com/Dolibarr/dolibarr/commit/d78eb4495e6dbe2b1a81ee870dd03732b1bfa8b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

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


  Commit: f6119cfee8a6ab51bc9848e78051e9d848112eca
      
https://github.com/Dolibarr/dolibarr/commit/f6119cfee8a6ab51bc9848e78051e9d848112eca
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
        htdocs/core/modules/expensereport/doc/pdf_standard.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/05cbf37aca64...f6119cfee8a6