[Dolibarr-git] [Dolibarr/dolibarr] 926f44: Fix bad utf8 files

[Laurent Destailleur]

  Branch: refs/heads/3.8_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 926f44ec0b8703942eeb73edb7ab149e6e847689
      
https://github.com/Dolibarr/dolibarr/commit/926f44ec0b8703942eeb73edb7ab149e6e847689
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-12 (Sat, 12 Mar 2016)

  Changed paths:
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Fix bad utf8 files


  Commit: fbc97b0bd58f57e6f662555fe56ac2ac6f7b9bcc
      
https://github.com/Dolibarr/dolibarr/commit/fbc97b0bd58f57e6f662555fe56ac2ac6f7b9bcc
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/comm/remise.php
    M htdocs/commande/list.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contrat/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions.lib.php
    M 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/card.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_holiday_users.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/product/admin/product.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/document.php
    M htdocs/product/price.php
    M htdocs/projet/activity/index.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/commerciaux.php
    M htdocs/societe/price.php
    M htdocs/societe/soc.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.8_backported

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql


  Commit: 7e84b2a3a39108997f871eb34e058259fa91e240
      
https://github.com/Dolibarr/dolibarr/commit/7e84b2a3a39108997f871eb34e058259fa91e240
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M dev/initdata/initdemo.sh
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/bookkeeping/list.php
    A htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/admin/dict.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/compta/facture/class/facture.class.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/product/ajax/products.php
    M htdocs/product/card.php
    M htdocs/product/document.php
    M htdocs/projet/class/project.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/90f9f488192b...7e84b2a3a391