[Dolibarr-git] [Dolibarr/dolibarr] 5cc8ec: Add accountancy code journal into bank card & modi...

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/langs/en_US/compta.lang

  Log Message:
  -----------
  Add accountancy code journal into bank card & modify presentation


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

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/langs/en_US/compta.lang

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

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


  Commit: 61ff1d2fb43ea4105d5bebbd147fda0539332ca3
      
https://github.com/Dolibarr/dolibarr/commit/61ff1d2fb43ea4105d5bebbd147fda0539332ca3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/langs/en_US/compta.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/25ce734638f1...61ff1d2fb43e