[Dolibarr-git] [Dolibarr/dolibarr] 408a02: Fix: Must return a string

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 408a02832034339a1ff1349baee8fc3505197468
      
https://github.com/Dolibarr/dolibarr/commit/408a02832034339a1ff1349baee8fc3505197468
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: Must return a string


  Commit: 1ae87887fb26fd6ccf3a934016a5f6d1ea515d68
      
https://github.com/Dolibarr/dolibarr/commit/1ae87887fb26fd6ccf3a934016a5f6d1ea515d68
  Author: jfefe <address@hidden>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Fix into user webservices : better error management and country detection
- Avoid errors when creating an user with thirdparty
- Add country detection in webservices when country_code is filled


  Commit: 0da1a64335e995738f0336e72b52a08951eb56b2
      
https://github.com/Dolibarr/dolibarr/commit/0da1a64335e995738f0336e72b52a08951eb56b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/projet/tasks/contact.php

  Log Message:
  -----------
  Fix: Missing vars and bar id.


  Commit: e8dc517cba2ed120b5a9aef469723d6788adbb21
      
https://github.com/Dolibarr/dolibarr/commit/e8dc517cba2ed120b5a9aef469723d6788adbb21
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Merge pull request #1410 from aternatik/fix_ws_user

Fix user webservice


  Commit: a6a26ec31358414352ebd39e692d6d679d5f3784
      
https://github.com/Dolibarr/dolibarr/commit/a6a26ec31358414352ebd39e692d6d679d5f3784
  Author: unknown <address@hidden>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M htdocs/cashdesk/validation_verif.php

  Log Message:
  -----------
  Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)


  Commit: e3ac9db9ec92b32ecf0286fcf92dc67692c57caf
      
https://github.com/Dolibarr/dolibarr/commit/e3ac9db9ec92b32ecf0286fcf92dc67692c57caf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M htdocs/core/boxes/box_graph_product_distribution.php

  Log Message:
  -----------
  Fix: Data was encode twice making bad translation for language with
special chars.


  Commit: db006dcdf833357076f71a9d96770750aa506c9e
      
https://github.com/Dolibarr/dolibarr/commit/db006dcdf833357076f71a9d96770750aa506c9e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M htdocs/compta/sociales/index.php

  Log Message:
  -----------
  Fix: Missing lang->load


  Commit: 255a1f649791bca731c38b6ca203f53226074a02
      
https://github.com/Dolibarr/dolibarr/commit/255a1f649791bca731c38b6ca203f53226074a02
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M htdocs/core/ajax/ziptown.php

  Log Message:
  -----------
  Fix: String translated twice


  Commit: 7078970ed154cb05cee843c6ad3ee6bf4aa0093d
      
https://github.com/Dolibarr/dolibarr/commit/7078970ed154cb05cee843c6ad3ee6bf4aa0093d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M htdocs/compta/sociales/index.php
    M htdocs/core/ajax/ziptown.php
    M htdocs/core/boxes/box_graph_product_distribution.php
    M htdocs/webservices/server_user.php

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

Conflicts:
        htdocs/core/class/html.form.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a146af508622...7078970ed154