[Dolibarr-git] [Dolibarr/dolibarr] 2d6877: Add tables to store working employee contracts

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2d6877ac67bcf15a0959f8fa4921bee35f89772c
      
https://github.com/Dolibarr/dolibarr/commit/2d6877ac67bcf15a0959f8fa4921bee35f89772c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    A htdocs/install/mysql/tables/llx_user_employment.key.sql
    A htdocs/install/mysql/tables/llx_user_employment.sql
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Add tables to store working employee contracts


  Commit: e99f115a8f9607665c83c252d574b77f235709b6
      
https://github.com/Dolibarr/dolibarr/commit/e99f115a8f9607665c83c252d574b77f235709b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/commande/class/api_deprecated_commande.class.php
    M htdocs/commande/class/api_orders.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/fr_FR/users.lang
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/install/mysql/tables/llx_user.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6653c03e0706...e99f115a8f96