[Dolibarr-git] [Dolibarr/dolibarr] 1ab695: FIX: dont remove price ht if it is forced (ie: cal...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1ab6955494849e57cad898585082f7be18b3f021
      
https://github.com/Dolibarr/dolibarr/commit/1ab6955494849e57cad898585082f7be18b3f021
  Author: Christophe Battarel <address@hidden>
  Date:   2014-12-27 (Sat, 27 Dec 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX: dont remove price ht if it is forced (ie: calculated by margin rate
and cost price, or by external module)


  Commit: 337d0558726a9e20485b5547b32100dc9352446a
      
https://github.com/Dolibarr/dolibarr/commit/337d0558726a9e20485b5547b32100dc9352446a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #2199 from altatof/3.6

FIX: dont remove price ht if it is forced (ie: calculated by margin rate and 
cost price, or by external module)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c7937a996280...337d0558726a