[Dolibarr-git] [Dolibarr/dolibarr] 0327f2: Merge https://github.com/Dolibarr/dolibarr into de...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0327f2d5cdaefd6b13bb212b9af840b93327b37d
      
https://github.com/Dolibarr/dolibarr/commit/0327f2d5cdaefd6b13bb212b9af840b93327b37d
  Author: Christophe Battarel <address@hidden>
  Date:   2019-04-10 (Wed, 10 Apr 2019)

  Changed paths:
    M htdocs/adherents/subscription/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/projet/index.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Merge https://github.com/Dolibarr/dolibarr into develop


  Commit: b04296984d4d3b6c5e25123bd26e42157a17e5b3
      
https://github.com/Dolibarr/dolibarr/commit/b04296984d4d3b6c5e25123bd26e42157a17e5b3
  Author: Christophe Battarel <address@hidden>
  Date:   2019-04-10 (Wed, 10 Apr 2019)

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

  Log Message:
  -----------
  NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN


  Commit: 4f87018c330a3a91d946b2e85ecbbfdcc4424226
      
https://github.com/Dolibarr/dolibarr/commit/4f87018c330a3a91d946b2e85ecbbfdcc4424226
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-04-11 (Thu, 11 Apr 2019)

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

  Log Message:
  -----------
  Update card.php


  Commit: f2fd07d8240a111d56402a7990efcf0e5fd7b67c
      
https://github.com/Dolibarr/dolibarr/commit/f2fd07d8240a111d56402a7990efcf0e5fd7b67c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-04-11 (Thu, 11 Apr 2019)

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

  Log Message:
  -----------
  Merge pull request #10991 from altatof/faccard

NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2ccd7b06c916...f2fd07d8240a