[Dolibarr-git] [Dolibarr/dolibarr] e46bda: Fix for jmobile

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e46bda5f9a8515cd168ef9689c55126ad5cc9a02
      
https://github.com/Dolibarr/dolibarr/commit/e46bda5f9a8515cd168ef9689c55126ad5cc9a02
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

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

  Log Message:
  -----------
  Fix for jmobile


  Commit: 60bd986efa169eb1947afa917b9aa2b1700e7b6c
      
https://github.com/Dolibarr/dolibarr/commit/60bd986efa169eb1947afa917b9aa2b1700e7b6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/remise.php
    M htdocs/comm/remx.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_societe_remise.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/install.lang
    M htdocs/societe/class/societe.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2e7e5151b7b7...60bd986efa16