[Dolibarr-git] [Dolibarr/dolibarr] 9c8aff: FIX #10787

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9c8aff0a28c5f565c406a324b729acea43c90e15
      
https://github.com/Dolibarr/dolibarr/commit/9c8aff0a28c5f565c406a324b729acea43c90e15
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    A htdocs/install/mysql/tables/llx_product_attribute_combination.key.sql

  Log Message:
  -----------
  FIX #10787


  Commit: f356d534cd3b2e909985d824d33b87d3f8142738
      
https://github.com/Dolibarr/dolibarr/commit/f356d534cd3b2e909985d824d33b87d3f8142738
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/bom/class/api_boms.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/bom/mod_bom_advanced.php
    M htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
    M htdocs/core/modules/commande/mod_commande_saphir.php
    M htdocs/core/modules/contract/mod_contract_magre.php
    M htdocs/core/modules/expedition/mod_expedition_ribera.php
    M htdocs/core/modules/expensereport/mod_expensereport_sand.php
    M htdocs/core/modules/facture/mod_facture_mercure.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/don/admin/donation.php
    M htdocs/don/admin/donation_extrafields.php
    M htdocs/don/card.php
    M htdocs/don/class/api_donations.class.php
    M htdocs/don/index.php
    M htdocs/don/list.php
    M htdocs/don/payment/card.php
    M htdocs/don/payment/payment.php
    M htdocs/don/stats/index.php
    M htdocs/don/tpl/linkedobjectblock.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/api_shipments.class.php
    M htdocs/expedition/index.php
    M htdocs/expedition/list.php
    M htdocs/expedition/shipment.php
    M htdocs/expedition/stats/index.php
    M htdocs/expedition/stats/month.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/exports/index.php
    M htdocs/ftp/admin/ftpclient.php
    M htdocs/ftp/index.php
    M htdocs/holiday/card.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/list.php
    M htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/index.php
    M htdocs/ifttt/admin/index.php
    M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
    M htdocs/product/class/product.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/54ddf276853e...f356d534cd3b