[Dolibarr-git] [Dolibarr/dolibarr] 4a1eb1: Fix margin calculation

[Juanjo Menent]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4a1eb1a58854c74e98bda8ad4c78081539f5d1cc
      
https://github.com/Dolibarr/dolibarr/commit/4a1eb1a58854c74e98bda8ad4c78081539f5d1cc
  Author: fhenry <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

  Log Message:
  -----------
  Fix margin calculation


  Commit: 441ad8c6d0709f7cb6aec907e91181f6d28df561
      
https://github.com/Dolibarr/dolibarr/commit/441ad8c6d0709f7cb6aec907e91181f6d28df561
  Author: fhenry <address@hidden>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M htdocs/langs/fr_FR/dict.lang

  Log Message:
  -----------
  Fix Trad Fr


  Commit: ae4e861147c6c8b9c034474f6651ee5c6ce7a136
      
https://github.com/Dolibarr/dolibarr/commit/ae4e861147c6c8b9c034474f6651ee5c6ce7a136
  Author: fhenry <address@hidden>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M htdocs/comm/index.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/filefunc.inc.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4


  Commit: 36528ca2648ba5fee456182dd723c55c89d800e0
      
https://github.com/Dolibarr/dolibarr/commit/36528ca2648ba5fee456182dd723c55c89d800e0
  Author: Juanjo Menent <address@hidden>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M htdocs/langs/fr_FR/dict.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

  Log Message:
  -----------
  Merge pull request #917 from FHenry/3.4

Fix margin calculation


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0b228b3a87cd...36528ca2648b