[Dolibarr-git] [Dolibarr/dolibarr] 728b64: Fix Bug #2583: Unable to create a bank transfer wi...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 728b64e334dc999fa965d61e2cfe1c4e65bd8747
      
https://github.com/Dolibarr/dolibarr/commit/728b64e334dc999fa965d61e2cfe1c4e65bd8747
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  Fix Bug #2583: Unable to create a bank transfer with localized numbers


  Commit: bbd01c0c8d0f238a642e26b5078d593571670879
      
https://github.com/Dolibarr/dolibarr/commit/bbd01c0c8d0f238a642e26b5078d593571670879
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project


  Commit: 9cfb295675bebb049bbc367e902c571f1b9a27c6
      
https://github.com/Dolibarr/dolibarr/commit/9cfb295675bebb049bbc367e902c571f1b9a27c6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref


  Commit: 6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
      
https://github.com/Dolibarr/dolibarr/commit/6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1906 ] Deplacement does not allow translated decimal format


  Commit: 8f0c41dbd21e48fa61164a6794958a7ad6c1e752
      
https://github.com/Dolibarr/dolibarr/commit/8f0c41dbd21e48fa61164a6794958a7ad6c1e752
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1905 ] Custom deplacement types do not get translated in 
deplacement card


  Commit: c0ddfbfab7690d15303039f653b86c7055794246
      
https://github.com/Dolibarr/dolibarr/commit/c0ddfbfab7690d15303039f653b86c7055794246
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Merge pull request #2597 from marcosgdf/bug-1906

Fixes for bugs #1906 and #1905


  Commit: 2b8efc302a173e57138e5be6c9de2af57b9838c8
      
https://github.com/Dolibarr/dolibarr/commit/2b8efc302a173e57138e5be6c9de2af57b9838c8
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Fix : shipment model selection


  Commit: 0000043c96973fbaa216a096849b0545417cfa83
      
https://github.com/Dolibarr/dolibarr/commit/0000043c96973fbaa216a096849b0545417cfa83
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Merge pull request #2629 from atm-maxime/3.5_fix_shipment_model

Fix : shipment model selection


  Commit: 9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
      
https://github.com/Dolibarr/dolibarr/commit/9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2583

Conflicts:
        ChangeLog


  Commit: b75722d450c78fdf86f704370e873294fa7378ca
      
https://github.com/Dolibarr/dolibarr/commit/b75722d450c78fdf86f704370e873294fa7378ca
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5


  Commit: b7cf0ded002d74d309c2d4293507bf1bfaf51ace
      
https://github.com/Dolibarr/dolibarr/commit/b7cf0ded002d74d309c2d4293507bf1bfaf51ace
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2577

Conflicts:
        ChangeLog


  Commit: 5f49b2a9bba08547db25348b59260e4ac029641e
      
https://github.com/Dolibarr/dolibarr/commit/5f49b2a9bba08547db25348b59260e4ac029641e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5


  Commit: ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
      
https://github.com/Dolibarr/dolibarr/commit/ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2576

Conflicts:
        ChangeLog


  Commit: 4de4c66bb74bb514129c986e8987f1aab7af9bdb
      
https://github.com/Dolibarr/dolibarr/commit/4de4c66bb74bb514129c986e8987f1aab7af9bdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5


  Commit: 37d8dafd4084de854ba66256f40ce2755631a8e9
      
https://github.com/Dolibarr/dolibarr/commit/37d8dafd4084de854ba66256f40ce2755631a8e9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/modules/societe/mod_codecompta_aquarium.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2576

Conflicts:
        ChangeLog


  Commit: be9ddb7748576aa75beff6988bf43a5dd31655bd
      
https://github.com/Dolibarr/dolibarr/commit/be9ddb7748576aa75beff6988bf43a5dd31655bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #2595 from marcosgdf/bug-2576

Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref


  Commit: b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
      
https://github.com/Dolibarr/dolibarr/commit/b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Log Message:
  -----------
  Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5


  Commit: ab77158757a91e17b7ff53f318699c128a8205b7
      
https://github.com/Dolibarr/dolibarr/commit/ab77158757a91e17b7ff53f318699c128a8205b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/projet/element.php

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

Conflicts:
        htdocs/expedition/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e49a46a386bd...ab77158757a9