[Dolibarr-git] [Dolibarr/dolibarr] e07eac: [ task #519 ] Add category association with conta...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e07eac9b17f53acc3f48304d9a038a6f25fb7bf5
      
https://github.com/Dolibarr/dolibarr/commit/e07eac9b17f53acc3f48304d9a038a6f25fb7bf5
  Author: Florian Henry <address@hidden>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/lib/contact.lib.php
    A htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/langs/fr_FR/mails.lang

  Log Message:
  -----------
   [ task #519 ] Add category association with contacts


  Commit: c518aa1019bffdd09c654a55bf70a47994347132
      
https://github.com/Dolibarr/dolibarr/commit/c518aa1019bffdd09c654a55bf70a47994347132
  Author: Florian Henry <address@hidden>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

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

  Log Message:
  -----------
  Add translation


  Commit: 5329312dd3cdd911c78c7a477b7b40d7bb7ea979
      
https://github.com/Dolibarr/dolibarr/commit/5329312dd3cdd911c78c7a477b7b40d7bb7ea979
  Author: Florian Henry <address@hidden>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    A htdocs/install/mysql/tables/llx_categorie_contact.key.sql
    A htdocs/install/mysql/tables/llx_categorie_contact.sql

  Log Message:
  -----------
  Add table


  Commit: 7b97214df50e57deaa71e9710e72d03b4f0d855a
      
https://github.com/Dolibarr/dolibarr/commit/7b97214df50e57deaa71e9710e72d03b4f0d855a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/lib/contact.lib.php
    A htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    A htdocs/install/mysql/tables/llx_categorie_contact.key.sql
    A htdocs/install/mysql/tables/llx_categorie_contact.sql
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/langs/fr_FR/mails.lang

  Log Message:
  -----------
  Merge pull request #1096 from FHenry/develop_categorycontact

Develop categorycontact


Compare: 
https://github.com/Dolibarr/dolibarr/compare/df88dc2f235a...7b97214df50e