[Dolibarr-git] [Dolibarr/dolibarr] c2bee0: FIX #6088

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c2bee0f9375035cd96645f3e9bebe968342d667a
      
https://github.com/Dolibarr/dolibarr/commit/c2bee0f9375035cd96645f3e9bebe968342d667a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  FIX #6088


  Commit: 829ff2299e7a6e3ae01abf8fef953e14d0750190
      
https://github.com/Dolibarr/dolibarr/commit/829ff2299e7a6e3ae01abf8fef953e14d0750190
  Author: Juanjo Menent <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    R htdocs/install/mysql/migration/3.8.0-3.9.0.sql

  Log Message:
  -----------
  Fix: Delete surplus migration file


  Commit: 97e21cb7758d9ad24534f4c639eaa0e01da40b48
      
https://github.com/Dolibarr/dolibarr/commit/97e21cb7758d9ad24534f4c639eaa0e01da40b48
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

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

  Log Message:
  -----------
  Fix : delete product was not possible if batch stock


  Commit: 46d84f8f1108f7ea8970b12037e3cf1a9d7ca49c
      
https://github.com/Dolibarr/dolibarr/commit/46d84f8f1108f7ea8970b12037e3cf1a9d7ca49c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    R htdocs/install/mysql/migration/3.8.0-3.9.0.sql

  Log Message:
  -----------
  Merge pull request #6111 from simnandez/3.8

Fix: Delete surplus migration file


  Commit: f49d332b7399f0bd9197f776310eacaa96495f6a
      
https://github.com/Dolibarr/dolibarr/commit/f49d332b7399f0bd9197f776310eacaa96495f6a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #6113 from atm-maxime/3.8

Fix : delete product was not possible if batch stock


  Commit: 5a2b8ff53cce86971b56299c7b6592819df1bb75
      
https://github.com/Dolibarr/dolibarr/commit/5a2b8ff53cce86971b56299c7b6592819df1bb75
  Author: Juanjo Menent <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/compta/localtax/clients.php

  Log Message:
  -----------
  FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1


  Commit: 6e9d6b4e496228a03e405ce6d3055ae1de84664f
      
https://github.com/Dolibarr/dolibarr/commit/6e9d6b4e496228a03e405ce6d3055ae1de84664f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/compta/localtax/clients.php

  Log Message:
  -----------
  Merge pull request #6128 from simnandez/3.9

FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1


  Commit: b42a2616bc5ff0fb35428914bce16dd7b0ef3af1
      
https://github.com/Dolibarr/dolibarr/commit/b42a2616bc5ff0fb35428914bce16dd7b0ef3af1
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.9

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


  Commit: 9b436ce871dbd8d9086fb92039a13ae526cb4d01
      
https://github.com/Dolibarr/dolibarr/commit/9b436ce871dbd8d9086fb92039a13ae526cb4d01
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M htdocs/compta/localtax/clients.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.9' into 4.0

Conflicts:
        htdocs/product/class/product.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/08f27a5c288c...9b436ce871db