[Dolibarr-git] [Dolibarr/dolibarr] 07bebb: Merge remote-tracking branch 'origin/3.6' into 3.6...

[Laurent Destailleur]

  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 07bebb609cc28c71a10b031dfcfb807597758527
      
https://github.com/Dolibarr/dolibarr/commit/07bebb609cc28c71a10b031dfcfb807597758527
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-20 (Sat, 20 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/ihm.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.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/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.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/fichinter/fiche.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/user/fiche.php
    M htdocs/webservices/server_contact.php

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

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/product/class/product.class.php


  Commit: 2f16fca635165fdab0647db47c55736c96d8b601
      
https://github.com/Dolibarr/dolibarr/commit/2f16fca635165fdab0647db47c55736c96d8b601
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-20 (Sat, 20 Dec 2014)

  Log Message:
  -----------
  Merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/50e011d44f51...2f16fca63516