[Dolibarr-git] [Dolibarr/dolibarr] 96e261: Add extrafield entity query filter

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 96e26100f03bf91ed2338b66b0c456251754256b
      
https://github.com/Dolibarr/dolibarr/commit/96e26100f03bf91ed2338b66b0c456251754256b
  Author: John <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Add extrafield entity query filter


  Commit: 6f526eb78087b02ef3617b249e3e4a6b5072b1a1
      
https://github.com/Dolibarr/dolibarr/commit/6f526eb78087b02ef3617b249e3e4a6b5072b1a1
  Author: atm-ph <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Fix wrong amount for situation invoice in sellsjournal


  Commit: d7da83ebc5718270997fd2a6a945c000b25ee572
      
https://github.com/Dolibarr/dolibarr/commit/d7da83ebc5718270997fd2a6a945c000b25ee572
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity

Fix extrafield entity query filter


  Commit: 0f3d2cc8df2e42993b14c63278a3935b841a800f
      
https://github.com/Dolibarr/dolibarr/commit/0f3d2cc8df2e42993b14c63278a3935b841a800f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice

Fix wrong amount for situation invoice in sellsjournal


  Commit: afdd504e16da651a353c7977246334bf440b3030
      
https://github.com/Dolibarr/dolibarr/commit/afdd504e16da651a353c7977246334bf440b3030
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/core/class/extrafields.class.php

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

Conflicts:
        htdocs/accountancy/journal/sellsjournal.php


  Commit: 885c2389af5e3cee6611ceaf41034665037f672a
      
https://github.com/Dolibarr/dolibarr/commit/885c2389af5e3cee6611ceaf41034665037f672a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9a83a6ad6e3a...885c2389af5e