[Dolibarr-git] [Dolibarr/dolibarr] 6dfeaa: FIX: #6062

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6dfeaabad5f77d77b83c6d34b6747b2c71e76ce2
      
https://github.com/Dolibarr/dolibarr/commit/6dfeaabad5f77d77b83c6d34b6747b2c71e76ce2
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  FIX: #6062


  Commit: 863e569593ca9397029eb2e68a1cedc92617b52c
      
https://github.com/Dolibarr/dolibarr/commit/863e569593ca9397029eb2e68a1cedc92617b52c
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M dev/skeletons/skeleton_list.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/export_csv.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/payment/card.php
    M htdocs/expensereport/payment/payment.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/exports/class/export.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/index.php
    M htdocs/projet/card.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '4.0' of https://github.com/Dolibarr/dolibarr into #6062


  Commit: 79d6fa334b811edbdfa637895d6d3270b044b005
      
https://github.com/Dolibarr/dolibarr/commit/79d6fa334b811edbdfa637895d6d3270b044b005
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  FIX: Consistent description for add or edit product


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

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  Merge pull request #6076 from olsesacl/#6062

FIX: #6062 Can't add images to the description when edit product


Compare: 
https://github.com/Dolibarr/dolibarr/compare/45783e6bc534...08f27a5c288c