[Dolibarr-git] [Dolibarr/dolibarr] 093e36: Merge branch '3.8' of address@hidden:Dolibarr/doli...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 093e3666ae33cc5d0964a69c9116cf7e5866ec99
      
https://github.com/Dolibarr/dolibarr/commit/093e3666ae33cc5d0964a69c9116cf7e5866ec99
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

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

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


  Commit: 4401d2ee9cce2620747ba52ebd4c23438f0f854e
      
https://github.com/Dolibarr/dolibarr/commit/4401d2ee9cce2620747ba52ebd4c23438f0f854e
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M htdocs/compta/bank/search.php
    M htdocs/compta/index.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/composition/card.php
    M htdocs/projet/element.php

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


  Commit: 94d92d3cbbc50e9b3fd584398931a9bbf5c02ccf
      
https://github.com/Dolibarr/dolibarr/commit/94d92d3cbbc50e9b3fd584398931a9bbf5c02ccf
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/product/ajax/products.php

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


  Commit: bfbb1c20bcc92a383fb64e04a1248e33937e1e9c
      
https://github.com/Dolibarr/dolibarr/commit/bfbb1c20bcc92a383fb64e04a1248e33937e1e9c
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX bug on email template


  Commit: b280a700d267f5cd481f39002bafd18a023c8704
      
https://github.com/Dolibarr/dolibarr/commit/b280a700d267f5cd481f39002bafd18a023c8704
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

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

  Log Message:
  -----------
  FIX missing column when module was installed before standard integration


  Commit: 1c0bdfcf1e767acc0481f0c0783b9de60c2566aa
      
https://github.com/Dolibarr/dolibarr/commit/1c0bdfcf1e767acc0481f0c0783b9de60c2566aa
  Author: Florian HENRY <address@hidden>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/accountancy/admin/index.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/core/class/html.form.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php

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


  Commit: d3b3e60d82edc38345473f0c4b478ae1c70310d1
      
https://github.com/Dolibarr/dolibarr/commit/d3b3e60d82edc38345473f0c4b478ae1c70310d1
  Author: Florian HENRY <address@hidden>
  Date:   2016-05-10 (Tue, 10 May 2016)

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

  Log Message:
  -----------
  Fix email template edition


  Commit: 4cbab1cf47a4d3fcb99acaf7e6f7cad74bdaa0f7
      
https://github.com/Dolibarr/dolibarr/commit/4cbab1cf47a4d3fcb99acaf7e6f7cad74bdaa0f7
  Author: Florian HENRY <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M htdocs/product/document.php

  Log Message:
  -----------
  FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH


  Commit: 12a5fbbea70e89e8ff26f6486ba5ac5ec405d0a1
      
https://github.com/Dolibarr/dolibarr/commit/12a5fbbea70e89e8ff26f6486ba5ac5ec405d0a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/product/document.php

  Log Message:
  -----------
  Merge pull request #5191 from FHenry/3.8

Fix email template edition


Compare: 
https://github.com/Dolibarr/dolibarr/compare/24673d066fdf...12a5fbbea70e