[Dolibarr-git] [Dolibarr/dolibarr] b0c68d: fix displaying accountancy code

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b0c68ddc61bf7c4bba6f2c1a55acb44fe8bb7728
      
https://github.com/Dolibarr/dolibarr/commit/b0c68ddc61bf7c4bba6f2c1a55acb44fe8bb7728
  Author: florian HENRY <address@hidden>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  fix displaying accountancy code


  Commit: 5afd2695fbc0a74818990ea220ad3b74f019de1d
      
https://github.com/Dolibarr/dolibarr/commit/5afd2695fbc0a74818990ea220ad3b74f019de1d
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  keep vat input with multiprices product creation


  Commit: 735f06fd83fbd1b63481e7964c7ed0009044bf7b
      
https://github.com/Dolibarr/dolibarr/commit/735f06fd83fbd1b63481e7964c7ed0009044bf7b
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-10-21 (Sat, 21 Oct 2017)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  FIX #7675


  Commit: 8baad70f6c6c28a19debf430a509049f8a9ecc05
      
https://github.com/Dolibarr/dolibarr/commit/8baad70f6c6c28a19debf430a509049f8a9ecc05
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-10-21 (Sat, 21 Oct 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  stock on supplier invoice back to draft


  Commit: 16c212c9fd5d8cb3a9c3dccd717c6f66e934c944
      
https://github.com/Dolibarr/dolibarr/commit/16c212c9fd5d8cb3a9c3dccd717c6f66e934c944
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  Merge pull request #7662 from atm-florian/6.0

fix displaying accountancy code


  Commit: 030cea6a0f655aeec526c9ee6903c0f49ad2057f
      
https://github.com/Dolibarr/dolibarr/commit/030cea6a0f655aeec526c9ee6903c0f49ad2057f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  Merge pull request #7664 from frederic34/patch-1

keep vat input with multiprices product creation


  Commit: 432536308424322496db24a3984b545792b3ca7d
      
https://github.com/Dolibarr/dolibarr/commit/432536308424322496db24a3984b545792b3ca7d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  Merge pull request #7676 from frederic34/patch-2

FIX #7675


  Commit: 6b0d060289686a79ab39c530529585b1c7a18762
      
https://github.com/Dolibarr/dolibarr/commit/6b0d060289686a79ab39c530529585b1c7a18762
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Merge pull request #7677 from frederic34/stockinvoice

stock on supplier invoice back to draft


  Commit: c9fceaad3c59bb43c625474e6da443523d151053
      
https://github.com/Dolibarr/dolibarr/commit/c9fceaad3c59bb43c625474e6da443523d151053
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/compta/bank/list.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/product/card.php

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

Conflicts:
        htdocs/compta/bank/index.php
        htdocs/fourn/facture/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/598422279427...c9fceaad3c59