[Dolibarr-git] [Dolibarr/dolibarr] 313495: FIX [ bug #3383 ] Company name is overlapped with ...

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3134950dbea66387d859597c69641388eab45110
      
https://github.com/Dolibarr/dolibarr/commit/3134950dbea66387d859597c69641388eab45110
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M ChangeLog
    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/livraison/doc/pdf_typhon.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

  Log Message:
  -----------
  FIX [ bug #3383 ] Company name is overlapped with company direction in PDF 
models

Close #3383


  Commit: 67b7162c59a7bb635aeab8a8a0fb24146538d7b9
      
https://github.com/Dolibarr/dolibarr/commit/67b7162c59a7bb635aeab8a8a0fb24146538d7b9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.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/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-3383

# Conflicts:
#       ChangeLog


  Commit: 54214cfddf8727e6aedec19068d5dd648274f173
      
https://github.com/Dolibarr/dolibarr/commit/54214cfddf8727e6aedec19068d5dd648274f173
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    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/livraison/doc/pdf_typhon.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

  Log Message:
  -----------
  Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3383

Conflicts:
        ChangeLog


  Commit: 846899dc06b5c702c8cedb6467504a796aa5547e
      
https://github.com/Dolibarr/dolibarr/commit/846899dc06b5c702c8cedb6467504a796aa5547e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    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/livraison/doc/pdf_typhon.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

  Log Message:
  -----------
  git push origin 3.7Merge branch 'marcosgdf-bug-3383' into 3.7


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7009c6b8900a...846899dc06b5