[Dolibarr-git] [Dolibarr/dolibarr] b4e810: FIX: #3392

[Juanjo Menent]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b4e810a7a848bfe5b0c3b75d9a7f4b6e9847110a
      
https://github.com/Dolibarr/dolibarr/commit/b4e810a7a848bfe5b0c3b75d9a7f4b6e9847110a
  Author: Florian HENRY <address@hidden>
  Date:   2015-08-17 (Mon, 17 Aug 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql

  Log Message:
  -----------
  FIX: #3392


  Commit: 8b62e562e5700532cadc14d869d3594d809769c2
      
https://github.com/Dolibarr/dolibarr/commit/8b62e562e5700532cadc14d869d3594d809769c2
  Author: Florian HENRY <address@hidden>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/langs/en_US/sendings.lang
    M htdocs/product/class/productbatch.class.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: d7ad38be13cd9139c168b5e8b13d74480bafe1f6
      
https://github.com/Dolibarr/dolibarr/commit/d7ad38be13cd9139c168b5e8b13d74480bafe1f6
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql

  Log Message:
  -----------
  Merge pull request #3393 from FHenry/3.8

FIX: #3392


Compare: 
https://github.com/Dolibarr/dolibarr/compare/911f37b6eb9a...d7ad38be13cd