[Dolibarr-git] [Dolibarr/dolibarr] 4751c5: Merge pull request #4881 from hregis/3.8_fix_merge

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4751c5ac67571631add421e8eecc22710ad7f35a
      
https://github.com/Dolibarr/dolibarr/commit/4751c5ac67571631add421e8eecc22710ad7f35a
  Author: Juanjo Menent <address@hidden>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #4881 from hregis/3.8_fix_merge

Fix: 3.7-3.8 fix merge


  Commit: 00bf8caa8caef6c77599a70480e998c92da210c6
      
https://github.com/Dolibarr/dolibarr/commit/00bf8caa8caef6c77599a70480e998c92da210c6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

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

  Log Message:
  -----------
  FIX #4870


  Commit: 2a19326a3f6c28b7e4261ae48d35b0bec8d1fc49
      
https://github.com/Dolibarr/dolibarr/commit/2a19326a3f6c28b7e4261ae48d35b0bec8d1fc49
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

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

  Log Message:
  -----------
  FIX Missing database escaping on supplier price insert/update


  Commit: d4529d19c7bc760a9e5153ab3f632dd247a122ea
      
https://github.com/Dolibarr/dolibarr/commit/d4529d19c7bc760a9e5153ab3f632dd247a122ea
  Author: Frédéric FRANCE <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Update facture.php

ref_client in order
ref_customer in shipping


  Commit: 599b225489ceca826190f331a1070e8d85c0c9f3
      
https://github.com/Dolibarr/dolibarr/commit/599b225489ceca826190f331a1070e8d85c0c9f3
  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: 30f27b6fac6c19b11aa356648f9ffbd7ae2d22aa
      
https://github.com/Dolibarr/dolibarr/commit/30f27b6fac6c19b11aa356648f9ffbd7ae2d22aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #4933 from frederic34/patch-10

FIX correctly retreive ref_customer


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

  Changed paths:
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  FIX Box disabled because bugged


  Commit: 4092f5fa2f98319fa9fd3c0dc8aca122c50d08e8
      
https://github.com/Dolibarr/dolibarr/commit/4092f5fa2f98319fa9fd3c0dc8aca122c50d08e8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M htdocs/compta/facture.php

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


  Commit: 39b61d6924b026a6175fd30eeecb7b4e2452a3fb
      
https://github.com/Dolibarr/dolibarr/commit/39b61d6924b026a6175fd30eeecb7b4e2452a3fb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/product/class/product.class.php

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8bdda8580178...39b61d6924b0