[Dolibarr-git] [Dolibarr/dolibarr] 6fcb54: FIX #7072

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6fcb54b2d6fbf77a4236d0bcf35ad23f0f515677
      
https://github.com/Dolibarr/dolibarr/commit/6fcb54b2d6fbf77a4236d0bcf35ad23f0f515677
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/photos.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php

  Log Message:
  -----------
  FIX #7072


  Commit: e35a9747c95638957bbe73298cc4256b662a3701
      
https://github.com/Dolibarr/dolibarr/commit/e35a9747c95638957bbe73298cc4256b662a3701
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/compta/bank/class/api_bankaccounts.class.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/tpl/bloc_showhide.tpl.php
    M htdocs/fourn/facture/list.php
    M htdocs/index.php
    M htdocs/install/mysql/tables/llx_extrafields.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/master.inc.php
    M htdocs/product/card.php
    M htdocs/product/stock/product.php
    M htdocs/user/logout.php

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


  Commit: 82c25e597822f264f9a82e0d0f2b5482f9d1e5a1
      
https://github.com/Dolibarr/dolibarr/commit/82c25e597822f264f9a82e0d0f2b5482f9d1e5a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M htdocs/core/tpl/bloc_showhide.tpl.php

  Log Message:
  -----------
  Fix syntax error


  Commit: 86d7644accb55fbf8504a5a6791564c110e2df28
      
https://github.com/Dolibarr/dolibarr/commit/86d7644accb55fbf8504a5a6791564c110e2df28
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M htdocs/core/tpl/bloc_showhide.tpl.php

  Log Message:
  -----------
  Fix regression syntax error


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7e192559d650...86d7644accb5