[Dolibarr-git] [Dolibarr/dolibarr] 017b18: Fix #6037 #6041

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 017b18d5c6d5941ad49443bfa8b25dc99fbf21b8
      
https://github.com/Dolibarr/dolibarr/commit/017b18d5c6d5941ad49443bfa8b25dc99fbf21b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-27 (Sun, 27 Nov 2016)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Fix #6037 #6041


  Commit: 65951d2f1b59e4c17eba614c27fa892366169f94
      
https://github.com/Dolibarr/dolibarr/commit/65951d2f1b59e4c17eba614c27fa892366169f94
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-27 (Sun, 27 Nov 2016)

  Changed paths:
    M htdocs/core/modules/modSociete.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ce10dc618ce8...65951d2f1b59