[Dolibarr-git] [Dolibarr/dolibarr] b2f299: Fix: [ bug #1411 ] Unable to set an expedition not...

[Laurent Destailleur]

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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/note.php

  Log Message:
  -----------
  Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not 
enabled


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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/note.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/note.php

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


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