[Dolibarr-git] [Dolibarr/dolibarr] d0a1d2: Merge branch '3.6' of address@hidden:Dolibarr/doli...

[Juanjo Menent]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d0a1d2c3a500e33c85662a1b7070167a92dd6e60
      
https://github.com/Dolibarr/dolibarr/commit/d0a1d2c3a500e33c85662a1b7070167a92dd6e60
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

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


  Commit: ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
      
https://github.com/Dolibarr/dolibarr/commit/ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

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


  Commit: 96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
      
https://github.com/Dolibarr/dolibarr/commit/96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

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


  Commit: ac6619daef402ebefa6b36d9199145449cda54fe
      
https://github.com/Dolibarr/dolibarr/commit/ac6619daef402ebefa6b36d9199145449cda54fe
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/install/upgrade2.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

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


  Commit: 01d1c89f118787f97b3c19fbb2d590c5b2681f03
      
https://github.com/Dolibarr/dolibarr/commit/01d1c89f118787f97b3c19fbb2d590c5b2681f03
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/product/reassort.php
    M htdocs/projet/liste.php

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


  Commit: 7505537a3e74e294580f0395b337d65bcd81e2ae
      
https://github.com/Dolibarr/dolibarr/commit/7505537a3e74e294580f0395b337d65bcd81e2ae
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/admin/dict.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/index.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/filefunc.inc.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/langs/en_US/errors.lang
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/projet/class/task.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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


  Commit: 52cb9581ff0446e36300849ccfbd2470cf0d69fb
      
https://github.com/Dolibarr/dolibarr/commit/52cb9581ff0446e36300849ccfbd2470cf0d69fb
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Fix multientity stock management


  Commit: 63a817c3a4d368beaff46e3bd72a456409446342
      
https://github.com/Dolibarr/dolibarr/commit/63a817c3a4d368beaff46e3bd72a456409446342
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/product/stock/index.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Fix wahrehouse multientty management


  Commit: 70df5538148cc8032d09fe396347e74f7701af34
      
https://github.com/Dolibarr/dolibarr/commit/70df5538148cc8032d09fe396347e74f7701af34
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge pull request #3494 from FHenry/3.6

3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/355fcc78cf2f...70df5538148c