[Dolibarr-git] [Dolibarr/dolibarr] 6b5b10: FIX #7224

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b5b10fc949fd04451a595a59cb14c33beca904c
      
https://github.com/Dolibarr/dolibarr/commit/6b5b10fc949fd04451a595a59cb14c33beca904c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/product/class/productcustomerprice.class.php

  Log Message:
  -----------
  FIX #7224


  Commit: 947acfffe204575feeee6eb5bb38cd88bd09424a
      
https://github.com/Dolibarr/dolibarr/commit/947acfffe204575feeee6eb5bb38cd88bd09424a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  FIX #7173


  Commit: 1b1d1a8d0b093f0bc34d717acce479048afea69e
      
https://github.com/Dolibarr/dolibarr/commit/1b1d1a8d0b093f0bc34d717acce479048afea69e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  FIX #7156


  Commit: bf1f60b31e55fb4bd24a4d790444d79810a36f12
      
https://github.com/Dolibarr/dolibarr/commit/bf1f60b31e55fb4bd24a4d790444d79810a36f12
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/adherents/subscription.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f3ef6448d7a9...bf1f60b31e55