[Dolibarr-git] [Dolibarr/dolibarr] 04f83a: FIX: always show fournprice select

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 04f83ae4ff9feddbf567dc1c94f41b083ee03cb7
      
https://github.com/Dolibarr/dolibarr/commit/04f83ae4ff9feddbf567dc1c94f41b083ee03cb7
  Author: Christophe Battarel <address@hidden>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  FIX: always show fournprice select


  Commit: 3ec5b46864ed195f4c76192c6ac4d4a9fa7af711
      
https://github.com/Dolibarr/dolibarr/commit/3ec5b46864ed195f4c76192c6ac4d4a9fa7af711
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Merge pull request #2294 from altatof/fix_fournprice_visibility

FIX: always show fournprice select


  Commit: 039a184d70bb8ae6b19fb531d8bf45aa8ca256c7
      
https://github.com/Dolibarr/dolibarr/commit/039a184d70bb8ae6b19fb531d8bf45aa8ca256c7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

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

Conflicts:
        htdocs/core/tpl/objectline_edit.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/07877bc3818e...039a184d70bb