[Dolibarr-git] [Dolibarr/dolibarr] 2147bd: Fix: remove lines with special code when convert t...

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2147bd23e64da09d96fc2a44395aa4293a2ab427
      
https://github.com/Dolibarr/dolibarr/commit/2147bd23e64da09d96fc2a44395aa4293a2ab427
  Author: Regis Houssin <address@hidden>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: remove lines with special code when convert to reduc


  Commit: a161ca37ffe23e530870f5fb83522910d075fff6
      
https://github.com/Dolibarr/dolibarr/commit/a161ca37ffe23e530870f5fb83522910d075fff6
  Author: Regis Houssin <address@hidden>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: use product_type instead special_code


  Commit: d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
      
https://github.com/Dolibarr/dolibarr/commit/d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
  Author: Regis Houssin <address@hidden>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: wrong test


  Commit: c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
      
https://github.com/Dolibarr/dolibarr/commit/c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #8128 from hregis/5.0_bug

Fix: remove lines with special code when convert to reduc


  Commit: c988d3f1cc3f4b4b9eb712439540e1e739597484
      
https://github.com/Dolibarr/dolibarr/commit/c988d3f1cc3f4b4b9eb712439540e1e739597484
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

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

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

Conflicts:
        htdocs/compta/facture.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2e3bb4a58550...c988d3f1cc3f