[Dolibarr/dolibarr] 538921: #FIX Error Margin with Situation Invoice

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 538921f47977c56cbf9aadbdb87bc60b705f6f5a
      
https://github.com/Dolibarr/dolibarr/commit/538921f47977c56cbf9aadbdb87bc60b705f6f5a
  Author: Pierre Ardoin <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M htdocs/core/class/html.formmargin.class.php

  Log Message:
  -----------
  #FIX Error Margin with Situation Invoice

Fix an issue that show a negative margin when $line->situation_percent is not 
100%

Now, the margin price take progress into account.


  Commit: 93cece6a3a3f9148962d81014477d1601caac1fb
      
https://github.com/Dolibarr/dolibarr/commit/93cece6a3a3f9148962d81014477d1601caac1fb
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-23 (Mon, 23 Dec 2019)

  Changed paths:
    M htdocs/core/class/html.formmargin.class.php

  Log Message:
  -----------
  Merge pull request #12738 from mapiolca/patch-16

#FIX Error Margin with Situation Invoice


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b3400fac249f...93cece6a3a3f