[Dolibarr-git] [Dolibarr/dolibarr] 3818bf: Fix: [ bug 1776 ] Undefined $deliverycompany varia...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3818bff86af9a9d0b98114e5fc6a88b926844f2e
      
https://github.com/Dolibarr/dolibarr/commit/3818bff86af9a9d0b98114e5fc6a88b926844f2e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address


  Commit: 4e9a378f0d45699b95617cae190540a8d45ad6ee
      
https://github.com/Dolibarr/dolibarr/commit/4e9a378f0d45699b95617cae190540a8d45ad6ee
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/stock/class/entrepot.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 branch '3.6' into bug-1776


  Commit: fd9f51df88927d9a41c62d50fc6a04d2d6fa515a
      
https://github.com/Dolibarr/dolibarr/commit/fd9f51df88927d9a41c62d50fc6a04d2d6fa515a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog


  Commit: 4e4efc97f044b99299d0993149ad9aec88e6e026
      
https://github.com/Dolibarr/dolibarr/commit/4e4efc97f044b99299d0993149ad9aec88e6e026
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1776' into 3.6


  Commit: 9fa2afb44bf7db1215aff910b3a407016e038a74
      
https://github.com/Dolibarr/dolibarr/commit/9fa2afb44bf7db1215aff910b3a407016e038a74
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c76af687ed99...9fa2afb44bf7