[Dolibarr-git] [Dolibarr/dolibarr] 9cfb29: Fix: Bug #2576 Unable to edit a dictionary entry t...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9cfb295675bebb049bbc367e902c571f1b9a27c6
      
https://github.com/Dolibarr/dolibarr/commit/9cfb295675bebb049bbc367e902c571f1b9a27c6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

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

  Log Message:
  -----------
  Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref


  Commit: 37d8dafd4084de854ba66256f40ce2755631a8e9
      
https://github.com/Dolibarr/dolibarr/commit/37d8dafd4084de854ba66256f40ce2755631a8e9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/modules/societe/mod_codecompta_aquarium.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2576

Conflicts:
        ChangeLog


  Commit: be9ddb7748576aa75beff6988bf43a5dd31655bd
      
https://github.com/Dolibarr/dolibarr/commit/be9ddb7748576aa75beff6988bf43a5dd31655bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #2595 from marcosgdf/bug-2576

Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5f49b2a9bba0...be9ddb774857