[Dolibarr-git] [Dolibarr/dolibarr] 55750e: Prepare extrafields into categories

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 55750e16d87f75f2d71dfd43684c4b844b658cc2
      
https://github.com/Dolibarr/dolibarr/commit/55750e16d87f75f2d71dfd43684c4b844b658cc2
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    A htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/class/categorie.class.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_categories_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_categories_extrafields.sql
    M htdocs/langs/en_US/categories.lang

  Log Message:
  -----------
  Prepare extrafields into categories


  Commit: f14d2fbfe04731381c871fe78441a7721e192214
      
https://github.com/Dolibarr/dolibarr/commit/f14d2fbfe04731381c871fe78441a7721e192214
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M htdocs/categories/admin/categorie.php
    M htdocs/langs/en_US/categories.lang

  Log Message:
  -----------
  Add information message for option into categories setup


  Commit: d9baae345689347a5fede8872bca39500430ae41
      
https://github.com/Dolibarr/dolibarr/commit/d9baae345689347a5fede8872bca39500430ae41
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

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

  Log Message:
  -----------
  Implement extrafields into category create


  Commit: e2b47b99191b13de4540917ccaeeb9a4484324e5
      
https://github.com/Dolibarr/dolibarr/commit/e2b47b99191b13de4540917ccaeeb9a4484324e5
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

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

  Log Message:
  -----------
  Category extrafields on categories: edit and view


  Commit: 503435689974ad2a2fc9491cb96aac3922808590
      
https://github.com/Dolibarr/dolibarr/commit/503435689974ad2a2fc9491cb96aac3922808590
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

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

  Log Message:
  -----------
  Manage extrafields deletion on categories


  Commit: 7974ae96ad9d692ba7d37973565bbce51485a7a3
      
https://github.com/Dolibarr/dolibarr/commit/7974ae96ad9d692ba7d37973565bbce51485a7a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M htdocs/categories/admin/categorie.php
    A htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.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_categories_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_categories_extrafields.sql
    M htdocs/install/mysql/tables/llx_product_customer_price.key.sql
    M htdocs/langs/en_US/categories.lang

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

Conflicts:
        htdocs/install/mysql/migration/3.5.0-3.6.0.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b1498c584d3b...7974ae96ad9d