[Dolibarr-git] [Dolibarr/dolibarr] 435b41: fix #10656

[Laurent Destailleur]

  Branch: refs/heads/9.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 435b416f939b7d906abb246c711acca8a8d25914
      
https://github.com/Dolibarr/dolibarr/commit/435b416f939b7d906abb246c711acca8a8d25914
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  fix #10656


  Commit: ca2eba866c641d799f378a834ef99ccd652f9179
      
https://github.com/Dolibarr/dolibarr/commit/ca2eba866c641d799f378a834ef99ccd652f9179
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Update list.php


  Commit: 2ad91213b2dd5c2bcd136b51f8a281f688df6378
      
https://github.com/Dolibarr/dolibarr/commit/2ad91213b2dd5c2bcd136b51f8a281f688df6378
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Update combinations.php


  Commit: 6fdd0191f4f38f3e8b4103c1fab38ab06cb654cd
      
https://github.com/Dolibarr/dolibarr/commit/6fdd0191f4f38f3e8b4103c1fab38ab06cb654cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge pull request #10676 from frederic34/patch-5

fix #10656


  Commit: c1fa48889e83c7dbe3a87217dff0fa696844d17e
      
https://github.com/Dolibarr/dolibarr/commit/c1fa48889e83c7dbe3a87217dff0fa696844d17e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Merge pull request #10677 from frederic34/patch-6

fix #10385


  Commit: da826c4bc7a37b99a6cf41411cc2dc0a7281e517
      
https://github.com/Dolibarr/dolibarr/commit/da826c4bc7a37b99a6cf41411cc2dc0a7281e517
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-27 (Wed, 27 Feb 2019)

  Changed paths:
    M htdocs/compta/compta-files.php

  Log Message:
  -----------
  Fix bad var name


  Commit: 8bdf1cd1b66440240670d4d471732698474295ef
      
https://github.com/Dolibarr/dolibarr/commit/8bdf1cd1b66440240670d4d471732698474295ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-27 (Wed, 27 Feb 2019)

  Changed paths:
    M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
    M htdocs/core/tpl/extrafields_list_search_title.tpl.php
    M htdocs/projet/tasks/list.php

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


  Commit: a48e9fdba40a54ce474561b586f2a73398e28ac8
      
https://github.com/Dolibarr/dolibarr/commit/a48e9fdba40a54ce474561b586f2a73398e28ac8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-27 (Wed, 27 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

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


  Commit: 6f0d5fcf3f0c74caaed43b13e33f91c37f2b6980
      
https://github.com/Dolibarr/dolibarr/commit/6f0d5fcf3f0c74caaed43b13e33f91c37f2b6980
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-27 (Wed, 27 Feb 2019)

  Changed paths:
    M htdocs/fourn/facture/list.php
    M htdocs/variants/combinations.php

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

Conflicts:
        htdocs/variants/combinations.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fb2b7a6c0917...6f0d5fcf3f0c