[Dolibarr-git] [Dolibarr/dolibarr] 0b73b4: Fix: [ bug #1416 ] Supplier order does not list do...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0b73b44f3403e9fee2efe2491d2893f3cef974b2
      
https://github.com/Dolibarr/dolibarr/commit/0b73b44f3403e9fee2efe2491d2893f3cef974b2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/supplier_order.php

  Log Message:
  -----------
  Fix: [ bug #1416 ] Supplier order does not list document models in the select 
box of the supplier order card


  Commit: 5853b9eb30b7ff9bfe7f26301d6baf0f7fb1ba53
      
https://github.com/Dolibarr/dolibarr/commit/5853b9eb30b7ff9bfe7f26301d6baf0f7fb1ba53
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/supplier_order.php
    M htdocs/filefunc.inc.php

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

Conflicts:
        ChangeLog


  Commit: ebeda9a271c9a95faf4ab60b3e40835c3ccf113b
      
https://github.com/Dolibarr/dolibarr/commit/ebeda9a271c9a95faf4ab60b3e40835c3ccf113b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/supplier_order.php
    M htdocs/filefunc.inc.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9e91225936eb...ebeda9a271c9