[Dolibarr-git] [Dolibarr/dolibarr] b8d5d6: Fix bad placeholder

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b8d5d6a383e0b066350b43462c26272cbc883e55
      
https://github.com/Dolibarr/dolibarr/commit/b8d5d6a383e0b066350b43462c26272cbc883e55
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-26 (Thu, 26 May 2016)

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

  Log Message:
  -----------
  Fix bad placeholder


  Commit: a1a335025ff7bcb40a2b698b051bd6a6af1667db
      
https://github.com/Dolibarr/dolibarr/commit/a1a335025ff7bcb40a2b698b051bd6a6af1667db
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M htdocs/contrat/card.php

  Log Message:
  -----------
  FIX #5230


  Commit: 2290f6a123af34dd89ff16695f045934eb27c8e0
      
https://github.com/Dolibarr/dolibarr/commit/2290f6a123af34dd89ff16695f045934eb27c8e0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  FIX Menu statistics was not visible if module proposal was not enabled


  Commit: 3cc8207bb734eab987e6b31a31997112de0ce2a2
      
https://github.com/Dolibarr/dolibarr/commit/3cc8207bb734eab987e6b31a31997112de0ce2a2
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  FIX Filter on category tag for suppliers


  Commit: ed148f70b3d1113c532a1fbe0b1381044f7956b6
      
https://github.com/Dolibarr/dolibarr/commit/ed148f70b3d1113c532a1fbe0b1381044f7956b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/core/modules/modAgenda.class.php

  Log Message:
  -----------
  FIX Filter on assigned to was preselected on current user on list "All
events" (instead of no filtering)


  Commit: 89cb1224740a625917fdf163bd27b36772164119
      
https://github.com/Dolibarr/dolibarr/commit/89cb1224740a625917fdf163bd27b36772164119
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/contrat/card.php

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


  Commit: 460d7ce915020a140233f811d8ff666b8664d8ab
      
https://github.com/Dolibarr/dolibarr/commit/460d7ce915020a140233f811d8ff666b8664d8ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  FIX Split of credit note into discount page generates records not
correctly recognised as credit note.


  Commit: 58ba5838cee97b43dcff0b1584536a844a3377f4
      
https://github.com/Dolibarr/dolibarr/commit/58ba5838cee97b43dcff0b1584536a844a3377f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/societe/agenda.php

  Log Message:
  -----------
  Fix alias name already visible into banner


  Commit: 0d277083e642bae91f3df5060487a9b605e2f78b
      
https://github.com/Dolibarr/dolibarr/commit/0d277083e642bae91f3df5060487a9b605e2f78b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M htdocs/langs/en_US/products.lang

  Log Message:
  -----------
  Fix duplicate translation


  Commit: ee420b79b1f7b532e33fa19aa4c63cb65864b895
      
https://github.com/Dolibarr/dolibarr/commit/ee420b79b1f7b532e33fa19aa4c63cb65864b895
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

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

  Log Message:
  -----------
  FIX Infinite loop on menu tree output for edition
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.


  Commit: 028ff5e84ce278dcd1f19324b7fa930b2465fd4b
      
https://github.com/Dolibarr/dolibarr/commit/028ff5e84ce278dcd1f19324b7fa930b2465fd4b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/contrat/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/societe/list.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.9' into develop

Conflicts:
        htdocs/fourn/facture/card.php
        htdocs/langs/en_US/products.lang
        htdocs/societe/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7519c4a602aa...028ff5e84ce2