[Dolibarr-git] [Dolibarr/dolibarr] 0547c9: Fix #6142

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0547c91d75da76b6e8327cd6df497e6d43638a8b
      
https://github.com/Dolibarr/dolibarr/commit/0547c91d75da76b6e8327cd6df497e6d43638a8b
  Author: tarrsalah <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M htdocs/core/lib/company.lib.php

  Log Message:
  -----------
  Fix #6142

load "banks" translation when constructing societe tab head in
`societe_prepare_head`.


  Commit: 871c69ad08cbb86446ff762c5fff65d17f2f697d
      
https://github.com/Dolibarr/dolibarr/commit/871c69ad08cbb86446ff762c5fff65d17f2f697d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M htdocs/core/lib/company.lib.php

  Log Message:
  -----------
  Merge branch 'fix_banks_trans_missing' of
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing

Conflicts:
        htdocs/core/lib/company.lib.php


  Commit: ca113553c63106c5c5b0867d67300f06ecad96c3
      
https://github.com/Dolibarr/dolibarr/commit/ca113553c63106c5c5b0867d67300f06ecad96c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M htdocs/core/lib/company.lib.php

  Log Message:
  -----------
  git push origin developMerge branch 'tarrsalah-fix_banks_trans_missing' into 
develop


  Commit: 0c5f66f10d8d37c2e8ae5787e176bc8aa6f5a57e
      
https://github.com/Dolibarr/dolibarr/commit/0c5f66f10d8d37c2e8ae5787e176bc8aa6f5a57e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6fa84206aa64...0c5f66f10d8d