[Dolibarr-git] [Dolibarr/dolibarr] f1d173: Fix: checkstyle

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f1d1736532874bddfad982d970dcfc36be1c3a1e
      
https://github.com/Dolibarr/dolibarr/commit/f1d1736532874bddfad982d970dcfc36be1c3a1e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: checkstyle


  Commit: a137b31a47526d56c286bf721efd7a2e58ce46fe
      
https://github.com/Dolibarr/dolibarr/commit/a137b31a47526d56c286bf721efd7a2e58ce46fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
    M htdocs/install/mysql/tables/llx_product_batch.key.sql
    M test/phpunit/SqlTest.php

  Log Message:
  -----------
  Fix: ON DELETE CASCADE is forbidden.

Conflicts:
        htdocs/install/mysql/migration/3.6.0-3.7.0.sql
        test/phpunit/SqlTest.php


  Commit: f0056b3b95e493ffd53801ebac798ee2fa70bc58
      
https://github.com/Dolibarr/dolibarr/commit/f0056b3b95e493ffd53801ebac798ee2fa70bc58
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

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

  Log Message:
  -----------
  Fix: Migration does not match tables


  Commit: 8bad4a3c1d937737e72ef99b6e1c7c8455562b16
      
https://github.com/Dolibarr/dolibarr/commit/8bad4a3c1d937737e72ef99b6e1c7c8455562b16
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
        htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
        htdocs/install/mysql/tables/llx_product_batch.key.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e6240491616e...8bad4a3c1d93