[Dolibarr-git] [Dolibarr/dolibarr] 53bd50: Align size for accounting account & Drop old table...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 53bd5022e0ff08738a6713b07a00139f30694fcc
      
https://github.com/Dolibarr/dolibarr/commit/53bd5022e0ff08738a6713b07a00139f30694fcc
  Author: aspangaro <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql
    M htdocs/install/mysql/tables/llx_accountingdebcred.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/mysql/tables/llx_c_chargesociales.sql
    M htdocs/install/mysql/tables/llx_c_revenuestamp.sql
    M htdocs/install/mysql/tables/llx_c_tva.sql
    R htdocs/install/mysql/tables/llx_compta.sql
    R htdocs/install/mysql/tables/llx_compta_account.sql
    R htdocs/install/mysql/tables/llx_compta_compte_generaux.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  Align size for accounting account & Drop old table & Typo


  Commit: 6cf8c3d08c9fa31ac2482cf4ea7db4eedbaef065
      
https://github.com/Dolibarr/dolibarr/commit/6cf8c3d08c9fa31ac2482cf4ea7db4eedbaef065
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql
    M htdocs/install/mysql/tables/llx_accountingdebcred.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/mysql/tables/llx_c_chargesociales.sql
    M htdocs/install/mysql/tables/llx_c_revenuestamp.sql
    M htdocs/install/mysql/tables/llx_c_tva.sql
    R htdocs/install/mysql/tables/llx_compta.sql
    R htdocs/install/mysql/tables/llx_compta_account.sql
    R htdocs/install/mysql/tables/llx_compta_compte_generaux.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

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


  Commit: 0044a1a33488dd8594d2cf49834f17a0ce93ac76
      
https://github.com/Dolibarr/dolibarr/commit/0044a1a33488dd8594d2cf49834f17a0ce93ac76
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql
    M htdocs/install/mysql/tables/llx_accountingdebcred.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/mysql/tables/llx_c_chargesociales.sql
    M htdocs/install/mysql/tables/llx_c_revenuestamp.sql
    M htdocs/install/mysql/tables/llx_c_tva.sql
    R htdocs/install/mysql/tables/llx_compta.sql
    R htdocs/install/mysql/tables/llx_compta_account.sql
    R htdocs/install/mysql/tables/llx_compta_compte_generaux.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  Merge branch 'aspangaro-develop' into develop


  Commit: ebc6bede13a8d9d18d78cde08048a347ea91dfed
      
https://github.com/Dolibarr/dolibarr/commit/ebc6bede13a8d9d18d78cde08048a347ea91dfed
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/livraison/class/livraison.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d8b9cdf5c2df...ebc6bede13a8