[Dolibarr-git] [Dolibarr/dolibarr] 5fb496: Merge branch 'develop' of ssh://address@hidden/Dol...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 5fb4962d728af0bc03d17cc1273387039dbbd02c
      
https://github.com/Dolibarr/dolibarr/commit/5fb4962d728af0bc03d17cc1273387039dbbd02c
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/adherents/admin/adherent.php
  M htdocs/adherents/class/adherent.class.php
  M htdocs/admin/dict.php
  M htdocs/admin/system/index.php
  M htdocs/boxes.php
  M htdocs/compta/facture/class/facture.class.php
  M htdocs/core/class/doleditor.class.php
  M htdocs/core/class/dolgraph.class.php
  M htdocs/core/class/smtps.class.php
  M htdocs/core/db/mysql.class.php
  M htdocs/core/db/mysqli.class.php
  M htdocs/core/filemanagerdol/connectors/php/commands.php
  R htdocs/core/lib/bookmark.lib.php
  M htdocs/core/lib/pdf.lib.php
  M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/langs/fr_FR/contracts.lang
  M htdocs/langs/fr_FR/projects.lang

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


  Commit: 7f2d23d084010527802df6428a14f7efad16084a
      
https://github.com/Dolibarr/dolibarr/commit/7f2d23d084010527802df6428a14f7efad16084a
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: [ bug #240 ] No description while adding a line in an Supplier
invoice


  Commit: d02b46756b43d23a3eed400b976fe6708ee30018
      
https://github.com/Dolibarr/dolibarr/commit/d02b46756b43d23a3eed400b976fe6708ee30018
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix: Removed warnings


  Commit: 1c657682865060a1813c8bab220b6bedf383057d
      
https://github.com/Dolibarr/dolibarr/commit/1c657682865060a1813c8bab220b6bedf383057d
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/adherents/index.php
  M htdocs/comm/propal/index.php
  M htdocs/commande/index.php
  M htdocs/compta/deplacement/index.php
  M htdocs/compta/dons/index.php
  M htdocs/contrat/index.php
  M htdocs/fourn/commande/index.php

  Log Message:
  -----------
  Fix: flot graph works with new json_encode


  Commit: 07ccc091eac93f88524f9b1fc45be709f16a8d2b
      
https://github.com/Dolibarr/dolibarr/commit/07ccc091eac93f88524f9b1fc45be709f16a8d2b
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/comm/propal/index.php

  Log Message:
  -----------
  Fix: Lang loaded


  Commit: 6189acc3b4cdcd4ca5e7376a41dad4c035ea4337
      
https://github.com/Dolibarr/dolibarr/commit/6189acc3b4cdcd4ca5e7376a41dad4c035ea4337
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/comm/propal/class/propalestats.class.php

  Log Message:
  -----------
  Fix: Amount must be HT


  Commit: 061be9ca47e9a0436c3f1f4426e0256e1b3ffd26
      
https://github.com/Dolibarr/dolibarr/commit/061be9ca47e9a0436c3f1f4426e0256e1b3ffd26
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-01 (Thu, 01 Dec 2011)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php

  Log Message:
  -----------
  Fix: Use filesystem encoding


Compare: https://github.com/Dolibarr/dolibarr/compare/24a63bb...061be9c