[Dolibarr-git] [Dolibarr/dolibarr] 1061a6: Fix: duplicate info

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1061a650d200ad159d8fe5c2b2624561f30ebb7a
      
https://github.com/Dolibarr/dolibarr/commit/1061a650d200ad159d8fe5c2b2624561f30ebb7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php

  Log Message:
  -----------
  Fix: duplicate info


  Commit: a1e778c146afe3ede7c152670bc8119eacf125e3
      
https://github.com/Dolibarr/dolibarr/commit/a1e778c146afe3ede7c152670bc8119eacf125e3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modSociete.class.php
    M test/phpunit/Example_import_company_1.csv
    M test/phpunit/FilesLibTest.php
    M test/phpunit/ImportTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4bd6f1111233...a1e778c146af