[Dolibarr-git] [Dolibarr/dolibarr] 0810e6: Fix: [ bug #1415 ] Intervention document model nam...

[Laurent Destailleur]

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

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

  Log Message:
  -----------
  Fix: [ bug #1415 ] Intervention document model name and suppliers model names 
is not shown properly in module configuration


  Commit: 83b58aca891700eec42bf26823f06976351b1106
      
https://github.com/Dolibarr/dolibarr/commit/83b58aca891700eec42bf26823f06976351b1106
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Typo


  Commit: 8a22a708b47492f0a47371539f1c0353b799bef4
      
https://github.com/Dolibarr/dolibarr/commit/8a22a708b47492f0a47371539f1c0353b799bef4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

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

  Log Message:
  -----------
  Fixed the bug for supplier invoice and supplier order pages


  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: 85d906078a5fb58cf74f98ac5b5a0cadafda8ad7
      
https://github.com/Dolibarr/dolibarr/commit/85d906078a5fb58cf74f98ac5b5a0cadafda8ad7
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Fix: [ bug #1443 ] Payment conditions is erased after editing supplier 
invoice label or limit date for payment


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

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

  Log Message:
  -----------
  Merge pull request #1648 from marcosgdf/bug-1415

Fix: [ bug #1415 ] Intervention document model name and suppliers model names 
is not shown properly in module configuration


  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


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/fournisseur.facture.class.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/fournisseur.facture.class.php

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


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

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    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/fichinter.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
        ChangeLog
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e04822a7c409...47c982c50660