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

[Laurent Destailleur]

  Branch: refs/heads/develop
  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: 7a8ac224ed3716f7fef80abfdc36c879aab5a0aa
      
https://github.com/Dolibarr/dolibarr/commit/7a8ac224ed3716f7fef80abfdc36c879aab5a0aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  FIX A draft can be deleted by a user with create permission.


  Commit: 239e42faa0fbf3a3e8e1e281b1fdeb14505e0b25
      
https://github.com/Dolibarr/dolibarr/commit/239e42faa0fbf3a3e8e1e281b1fdeb14505e0b25
  Author: Regis Houssin <address@hidden>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

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

  Log Message:
  -----------
  Fix: contract use "total_vat" instead "total_tva"


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

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

  Log Message:
  -----------
  Merge pull request #6097 from hregis/4.0_bug

Fix: contract use "total_vat" instead "total_tva"


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Better message after report on #5933


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

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

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


  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


  Commit: 4969af8c749b84e11ed230f732385234d824c168
      
https://github.com/Dolibarr/dolibarr/commit/4969af8c749b84e11ed230f732385234d824c168
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/product/card.php
    M htdocs/supplier_proposal/card.php

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

Conflicts:
        ChangeLog
        htdocs/product/card.php


  Commit: 190f432c23432f88655f45e87a45b2a6200fe837
      
https://github.com/Dolibarr/dolibarr/commit/190f432c23432f88655f45e87a45b2a6200fe837
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/user/document.php
    M htdocs/user/info.php
    M htdocs/user/note.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/aa2d783aaac6...190f432c2343