[Dolibarr-git] [Dolibarr/dolibarr] 78ec4d: Fix trad currency

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 78ec4d595b11c22317c54074d0b61a998b3b18cb
      
https://github.com/Dolibarr/dolibarr/commit/78ec4d595b11c22317c54074d0b61a998b3b18cb
  Author: Florian HENRY <address@hidden>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M htdocs/product/composition/fiche.php

  Log Message:
  -----------
  Fix trad currency


  Commit: d6fc967162dcd3f184155b0cafc3c49ca3e34bda
      
https://github.com/Dolibarr/dolibarr/commit/d6fc967162dcd3f184155b0cafc3c49ca3e34bda
  Author: Florian HENRY <address@hidden>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M htdocs/admin/ldap_groups.php
    M htdocs/user/group/ldap.php

  Log Message:
  -----------
  Merge branch '3.6' into 3.6_fix


  Commit: 4b28ff005ef29c8de594eca9b24c2ab8a54356ea
      
https://github.com/Dolibarr/dolibarr/commit/4b28ff005ef29c8de594eca9b24c2ab8a54356ea
  Author: Florian HENRY <address@hidden>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/fiche.php

  Log Message:
  -----------
  Return error message on category creation failure


  Commit: ae303f34a4deea8b0eea98785b25a4db7b0fb919
      
https://github.com/Dolibarr/dolibarr/commit/ae303f34a4deea8b0eea98785b25a4db7b0fb919
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/fiche.php
    M htdocs/product/composition/fiche.php

  Log Message:
  -----------
  Merge pull request #1935 from FHenry/3.6_fix

3.6 fix -       Fix trad currency -  Return error message on category creation 
failure


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8121aeb0b63e...ae303f34a4de