[Dolibarr-git] [Dolibarr/dolibarr] 1cda69: Fix: add entity field in llx_societe_remise_except...

[Juanjo Menent]

  Branch: refs/heads/3.9_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1cda69dfbe8e4ee71e8897054bd771b2a49f8efc
      
https://github.com/Dolibarr/dolibarr/commit/1cda69dfbe8e4ee71e8897054bd771b2a49f8efc
  Author: Regis Houssin <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M htdocs/comm/remx.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/html.form.class.php
    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:
  -----------
  Fix: add entity field in llx_societe_remise_except, useful when
third-sharing is used with multicompany

Conflicts:
        htdocs/core/class/html.form.class.php
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql
        htdocs/install/mysql/tables/llx_societe_remise_except.sql
        htdocs/install/upgrade2.php
        htdocs/societe/class/societe.class.php

Change-Id: I72107c3b08b071ce091a1e1f8b71ee7cffa726ab


  Commit: b7f4575ca07fe83586eff0086f92198ad2fcce18
      
https://github.com/Dolibarr/dolibarr/commit/b7f4575ca07fe83586eff0086f92198ad2fcce18
  Author: Regis Houssin <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M htdocs/comm/remise.php
    M htdocs/install/mysql/tables/llx_societe_remise.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/install.lang
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix: add entity field in llx_societe_remise, useful when third-sharing
is used with multicompany

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql

Change-Id: Ifd2f2ca81d71fd5b6e60b08b209279b761119c4e


  Commit: 505c7651aa3adf27e48835c9428a3c3eb4839958
      
https://github.com/Dolibarr/dolibarr/commit/505c7651aa3adf27e48835c9428a3c3eb4839958
  Author: Regis Houssin <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: remove conflict


  Commit: cc1a81a85144fced80fa6d97a4da65ec031d565b
      
https://github.com/Dolibarr/dolibarr/commit/cc1a81a85144fced80fa6d97a4da65ec031d565b
  Author: Juanjo Menent <address@hidden>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    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/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 pull request #5655 from hregis/3.9_backported

Fix: add entity field in remise and remise_except


Compare: 
https://github.com/Dolibarr/dolibarr/compare/21bc9dc870cb...cc1a81a85144