[Dolibarr-git] [Dolibarr/dolibarr] c667f8: [ task #1793 ] Create new permission to restrict c...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c667f8734a61621acc18095b98c3cec4561e8ee8
      
https://github.com/Dolibarr/dolibarr/commit/c667f8734a61621acc18095b98c3cec4561e8ee8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/modMargin.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  [ task #1793 ] Create new permission to restrict commercial agent margin to 
logged user


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

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/modMargin.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

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

Conflicts:
        ChangeLog
        htdocs/margin/lib/margins.lib.php


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

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/modMargin.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-task-1793' into develop


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

  Changed paths:
    M README.md

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f27037171641...0aab43c72843