[Dolibarr-git] [Dolibarr/dolibarr] b42c87: Fix_situation_discount_used

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b42c87256c5b716dfbd3efed4b74d983159de597
      
https://github.com/Dolibarr/dolibarr/commit/b42c87256c5b716dfbd3efed4b74d983159de597
  Author: John <address@hidden>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M htdocs/compta/facture/card.php

  Log Message:
  -----------
  Fix_situation_discount_used


  Commit: 3dd11e1eaff09e2d5bcfd96897ddb0ce8789ae65
      
https://github.com/Dolibarr/dolibarr/commit/3dd11e1eaff09e2d5bcfd96897ddb0ce8789ae65
  Author: John <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M htdocs/compta/facture/card.php

  Log Message:
  -----------
  Fix discount id


  Commit: 7de812d2ed7b1563d647336fe1d64d972e437a0f
      
https://github.com/Dolibarr/dolibarr/commit/7de812d2ed7b1563d647336fe1d64d972e437a0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M htdocs/compta/facture/card.php

  Log Message:
  -----------
  Merge pull request #8793 from atm-john/Fix_situation_discount_used

Fix creating next situation invoice if a discount was allready apply


  Commit: 8951c4a7a5eebfc587ddcc2e504178f6c1a33c38
      
https://github.com/Dolibarr/dolibarr/commit/8951c4a7a5eebfc587ddcc2e504178f6c1a33c38
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M htdocs/compta/facture/card.php

  Log Message:
  -----------
  Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0


  Commit: 745aa4bd73e0ca3a6b51c66d9cf7c1eabee6a1e4
      
https://github.com/Dolibarr/dolibarr/commit/745aa4bd73e0ca3a6b51c66d9cf7c1eabee6a1e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M htdocs/compta/facture/card.php

  Log Message:
  -----------
  Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/de84f0e6876c...745aa4bd73e0
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.