[Dolibarr-git] [Dolibarr/dolibarr] a47acc: FIX PMP is deprecated at warehouse level

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a47accb1c3f7bf91486fb8870201a0d6e0bc0f0c
      
https://github.com/Dolibarr/dolibarr/commit/a47accb1c3f7bf91486fb8870201a0d6e0bc0f0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M htdocs/core/modules/modStock.class.php

  Log Message:
  -----------
  FIX PMP is deprecated at warehouse level


  Commit: feb35adbe1d5235d5bb8fa824d8e2fcfadd7a090
      
https://github.com/Dolibarr/dolibarr/commit/feb35adbe1d5235d5bb8fa824d8e2fcfadd7a090
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  FIX Missing clean of criteria


  Commit: be483bd7879d2331d86a9ed6f953f5394451c716
      
https://github.com/Dolibarr/dolibarr/commit/be483bd7879d2331d86a9ed6f953f5394451c716
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M htdocs/langs/en_US/products.lang
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  FIX Some records were lost into margin per product report


  Commit: be8384389f04a9310f37e8edf35c167af7a16870
      
https://github.com/Dolibarr/dolibarr/commit/be8384389f04a9310f37e8edf35c167af7a16870
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-02 (Sat, 02 Apr 2016)

  Changed paths:
    M htdocs/core/lib/files.lib.php

  Log Message:
  -----------
  FIX Creation of thumb image for size "small" was not done.

Conflicts:
        htdocs/core/lib/files.lib.php


  Commit: c0b2d7405a676fcc9d6788f9732df0d6a6b87bd3
      
https://github.com/Dolibarr/dolibarr/commit/c0b2d7405a676fcc9d6788f9732df0d6a6b87bd3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-02 (Sat, 02 Apr 2016)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/images.lib.php

  Log Message:
  -----------
  FIX Generated thumbs must always use the png format so using thumbs can
work.


  Commit: 066c793de2336a37490c486253a27f1f996cd8b7
      
https://github.com/Dolibarr/dolibarr/commit/066c793de2336a37490c486253a27f1f996cd8b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-02 (Sat, 02 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/images.lib.php

  Log Message:
  -----------
  FIX image extension must be in lower case

Conflicts:
        htdocs/core/lib/files.lib.php


  Commit: 10f639507fac78a906cf48d044edf3bcc58583f0
      
https://github.com/Dolibarr/dolibarr/commit/10f639507fac78a906cf48d044edf3bcc58583f0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-02 (Sat, 02 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/modules/modStock.class.php

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

Conflicts:
        htdocs/core/lib/files.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c12541f4f2ac...10f639507fac