[Dolibarr-git] [Dolibarr/dolibarr] 7e16d0: Fix: [ bug #1792 ] Users are not allowed to see ma...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7e16d0c1d3de4e30fa0649acaf4a32af715752d3
      
https://github.com/Dolibarr/dolibarr/commit/7e16d0c1d3de4e30fa0649acaf4a32af715752d3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Fix: [ bug #1792 ] Users are not allowed to see margins module index page 
when no product view permission is enabled


  Commit: 05f08a7181cbeb5f9c83a9e0e0cf19252f893cd4
      
https://github.com/Dolibarr/dolibarr/commit/05f08a7181cbeb5f9c83a9e0e0cf19252f893cd4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1762

Conflicts:
        ChangeLog


  Commit: a51ea308f55b2cf7b731dea35d9ffbbc4a818014
      
https://github.com/Dolibarr/dolibarr/commit/a51ea308f55b2cf7b731dea35d9ffbbc4a818014
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1762' into 3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5087ac815309...a51ea308f55b