[Dolibarr-git] [Dolibarr/dolibarr] b30ee6: Better fix for #2725

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b30ee6b3fa75864327f52f536b4670836ddd9cea
      
https://github.com/Dolibarr/dolibarr/commit/b30ee6b3fa75864327f52f536b4670836ddd9cea
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Better fix for #2725


  Commit: 1a70e9c5f9bdcb5b34de76eb5bbae2fbe58fbdc5
      
https://github.com/Dolibarr/dolibarr/commit/1a70e9c5f9bdcb5b34de76eb5bbae2fbe58fbdc5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6cfd8d64f5e0...1a70e9c5f9bd