[Dolibarr-git] [Dolibarr/dolibarr] 2aa399: Fix :: Sql problem for fresh install on resource t...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2aa3995b73d808fd4a325000d312e2f95c4ec26b
      
https://github.com/Dolibarr/dolibarr/commit/2aa3995b73d808fd4a325000d312e2f95c4ec26b
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Fix :: Sql problem for fresh install on resource table // Ok in migration 
script


  Commit: 03f642e8619d4690cef422b965de10ccd971438b
      
https://github.com/Dolibarr/dolibarr/commit/03f642e8619d4690cef422b965de10ccd971438b
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  Merge branch 'Upstream/3.6'


  Commit: a2f0866c0c036b015cc39de9f74b9f590e55a299
      
https://github.com/Dolibarr/dolibarr/commit/a2f0866c0c036b015cc39de9f74b9f590e55a299
  Author: aspangaro <address@hidden>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M htdocs/cashdesk/affContenu.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/includes/ckeditor/contents.css
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge branch 'Upstream/3.6'


  Commit: b561d48b5f4f4828ec1e83c6e8df18f4bc710551
      
https://github.com/Dolibarr/dolibarr/commit/b561d48b5f4f4828ec1e83c6e8df18f4bc710551
  Author: aspangaro <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/fichinter/class/fichinter.class.php

  Log Message:
  -----------
  Merge branch 'Upstream/3.6'


  Commit: b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
      
https://github.com/Dolibarr/dolibarr/commit/b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
  Author: aspangaro <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Fix llx_c_type_resource when you update from a 3.6-beta


  Commit: f1993e719fd0bd2aa08e760b939c8225d13d59cb
      
https://github.com/Dolibarr/dolibarr/commit/f1993e719fd0bd2aa08e760b939c8225d13d59cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Merge pull request #1846 from aspangaro/3.6

Fix :: llx_c_type_resource when you update from a 3.6-beta


Compare: 
https://github.com/Dolibarr/dolibarr/compare/14ec2cd1d958...f1993e719fd0