[Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 f...

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6a3310daf7aecda23535f21d8848bf2185e6d030
      
https://github.com/Dolibarr/dolibarr/commit/6a3310daf7aecda23535f21d8848bf2185e6d030
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data


  Commit: 5139954365489c3d7e65a7525a27d094944b8ab3
      
https://github.com/Dolibarr/dolibarr/commit/5139954365489c3d7e65a7525a27d094944b8ab3
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Fix: add filter in "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034_Original filename""


  Commit: 65b049fdf559aee19a45a6d4bca664c9767114c9
      
https://github.com/Dolibarr/dolibarr/commit/65b049fdf559aee19a45a6d4bca664c9767114c9
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Fix: Drop foreign key for avoid Mysql crash


  Commit: 792911b14f02b7c2226b626a2761bc949c624ac5
      
https://github.com/Dolibarr/dolibarr/commit/792911b14f02b7c2226b626a2761bc949c624ac5
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Revert "Fix: Drop foreign key for avoid Mysql crash"

This reverts commit 65b049fdf559aee19a45a6d4bca664c9767114c9.


  Commit: 8d824785f0420ddfd74de79917e610f08fc609eb
      
https://github.com/Dolibarr/dolibarr/commit/8d824785f0420ddfd74de79917e610f08fc609eb
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'dolibarr/3.7' into 3.7


  Commit: 14780747fcc9b232acb73558fe5032665988b426
      
https://github.com/Dolibarr/dolibarr/commit/14780747fcc9b232acb73558fe5032665988b426
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/public/demo/index.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'dolibarr/3.7' into 3.7


  Commit: 296b76603a2354134bad2d0dc913d95ba260f780
      
https://github.com/Dolibarr/dolibarr/commit/296b76603a2354134bad2d0dc913d95ba260f780
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/product/card.php
    M htdocs/product/list.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.7_bug


  Commit: f5168625d810fb14d4c8b976979eae05eabc2ded
      
https://github.com/Dolibarr/dolibarr/commit/f5168625d810fb14d4c8b976979eae05eabc2ded
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php

  Log Message:
  -----------
  Fix: broken feature: barcode search #3019


  Commit: aecc5d27a3b8087506a168e6e78bdcdafdf0e941
      
https://github.com/Dolibarr/dolibarr/commit/aecc5d27a3b8087506a168e6e78bdcdafdf0e941
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #3036 from hregis/3.7_bug

Fix: broken feature: barcode search #3019


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4dbb3789a23e...aecc5d27a3b8