[Dolibarr-git] [Dolibarr/dolibarr] 7d8cf9: FIX: bad margin and buy_price calculation when tot...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
      
https://github.com/Dolibarr/dolibarr/commit/7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

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

  Log Message:
  -----------
  FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line


  Commit: 891f8d9442d5532dba9a3440c8028caf31ff02c4
      
https://github.com/Dolibarr/dolibarr/commit/891f8d9442d5532dba9a3440c8028caf31ff02c4
  Author: Frédéric FRANCE <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 989cd87446522513fd7f886a19803c12200d1fe4
      
https://github.com/Dolibarr/dolibarr/commit/989cd87446522513fd7f886a19803c12200d1fe4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

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

  Log Message:
  -----------
  Merge pull request #2066 from altatof/fix_margin_recap

FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on 
a line


  Commit: bd8391163a04ce2a193a472ee31c5196ed8689b6
      
https://github.com/Dolibarr/dolibarr/commit/bd8391163a04ce2a193a472ee31c5196ed8689b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge pull request #2067 from frederic34/patch-2

Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 1f986014f114c90c367110e258d33487d5360052
      
https://github.com/Dolibarr/dolibarr/commit/1f986014f114c90c367110e258d33487d5360052
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/webservices/server_contact.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9aab62ab36d4...1f986014f114