[Dolibarr-git] [Dolibarr/dolibarr] afaf56: Fix : bad link to categorie admin page

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: afaf5698a51b970cce8c1a548dd3a9c72e46be95
      
https://github.com/Dolibarr/dolibarr/commit/afaf5698a51b970cce8c1a548dd3a9c72e46be95
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

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

  Log Message:
  -----------
  Fix : bad link to categorie admin page


  Commit: b2b8fbb2278d2feb6fbef7514540ad0bf8680473
      
https://github.com/Dolibarr/dolibarr/commit/b2b8fbb2278d2feb6fbef7514540ad0bf8680473
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/categories/fiche.php

  Log Message:
  -----------
  Fix : bad call of extrafields into categories


  Commit: d256799abfc81be948e0fc489275ad1398679a03
      
https://github.com/Dolibarr/dolibarr/commit/d256799abfc81be948e0fc489275ad1398679a03
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    A htdocs/categories/traduction.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.key.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.sql

  Log Message:
  -----------
  Work on adding catgory translation


  Commit: 098fa7027cb56d7ce4253cac0aa1afd948fa4b1c
      
https://github.com/Dolibarr/dolibarr/commit/098fa7027cb56d7ce4253cac0aa1afd948fa4b1c
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/categories/traduction.php

  Log Message:
  -----------
  Remove unused note into category translation


  Commit: dbaddd1fbdace4c77b81ccd26988a0240391a9d7
      
https://github.com/Dolibarr/dolibarr/commit/dbaddd1fbdace4c77b81ccd26988a0240391a9d7
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Add translation support into categories arbo


  Commit: 6b1a57d1b755ebbfb7caacc3ef24ed3282689063
      
https://github.com/Dolibarr/dolibarr/commit/6b1a57d1b755ebbfb7caacc3ef24ed3282689063
  Author: jfefe <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: ac07dd5a8cbe354783485ffac880456700613282
      
https://github.com/Dolibarr/dolibarr/commit/ac07dd5a8cbe354783485ffac880456700613282
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc


  Commit: 4a23a8a789ddef78f3a035d4d613b18254acb1d9
      
https://github.com/Dolibarr/dolibarr/commit/4a23a8a789ddef78f3a035d4d613b18254acb1d9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    A htdocs/categories/traduction.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.key.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.sql

  Log Message:
  -----------
  Merge branch 'category_translate' of github.com:aternatik/dolibarr into
aternatik-category_translate

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c60000380769...4a23a8a789dd