[Dolibarr-git] [Dolibarr/dolibarr] 07fa80: Fix: Correct concat when mixing not html and html ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 07fa800360bf0bd18babeb52ed36ad26f2e29f64
      
https://github.com/Dolibarr/dolibarr/commit/07fa800360bf0bd18babeb52ed36ad26f2e29f64
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix: Correct concat when mixing not html and html descriptions


  Commit: 832a47232582aa5bd7d09300d994593c5dc589de
      
https://github.com/Dolibarr/dolibarr/commit/832a47232582aa5bd7d09300d994593c5dc589de
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
    M htdocs/compta/facture/prelevement.php

  Log Message:
  -----------
  Little clean of page


  Commit: 2170801fd2599c437698a9d356f508880007fdb2
      
https://github.com/Dolibarr/dolibarr/commit/2170801fd2599c437698a9d356f508880007fdb2
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_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/pdf/pdf_sirocco.modules.php
    M htdocs/core/modules/livraison/pdf/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
    M htdocs/fichinter/class/fichinter.class.php

  Log Message:
  -----------
  New: Uniformize pdf generation code. We also keep space to repeat pdf
head info.


  Commit: 3953be53a75050ea2733f5ae74779265172a6225
      
https://github.com/Dolibarr/dolibarr/commit/3953be53a75050ea2733f5ae74779265172a6225
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/admin/adherent_extrafields.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/core/lib/company.lib.php
    A htdocs/core/tpl/admin_extrafields.tpl.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/societe/admin/contact_extrafields.php
    M htdocs/societe/admin/societe_extrafields.php

  Log Message:
  -----------
  Qual: Mutualize code
New: Can use extrafields on contacts/addresses.


  Commit: 9ab06539025558c318f3e8e83a44aefb2e6d8ddd
      
https://github.com/Dolibarr/dolibarr/commit/9ab06539025558c318f3e8e83a44aefb2e6d8ddd
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ada85df64966...9ab065390255