[Dolibarr-git] [Dolibarr/dolibarr] 466de6: Fix: Solve pb of too many embedded tables

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 466de67b5b8bec3c81fb43cc70e6bca6524c3051
      
https://github.com/Dolibarr/dolibarr/commit/466de67b5b8bec3c81fb43cc70e6bca6524c3051
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Fix: Solve pb of too many embedded tables


  Commit: 57bd043f59227dfbcce34ffe79d446da98a6403e
      
https://github.com/Dolibarr/dolibarr/commit/57bd043f59227dfbcce34ffe79d446da98a6403e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: Missing lang loading


  Commit: 6039c81845ce705c35f2acdea1a1b24419d75ec4
      
https://github.com/Dolibarr/dolibarr/commit/6039c81845ce705c35f2acdea1a1b24419d75ec4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M htdocs/core/lib/company.lib.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Fix: copy to clipboard does not work with jmobile
Fix: Bad translation


  Commit: 3f78fe8c936302dbb78c1aab9e1cf209828cfebb
      
https://github.com/Dolibarr/dolibarr/commit/3f78fe8c936302dbb78c1aab9e1cf209828cfebb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

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

  Log Message:
  -----------
  Fix: Avoid to get duplicate field


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/agenda_extsites.php
    M htdocs/compta/facture.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/functions.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/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/import/import_csv.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/project/pdf/pdf_baleine.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/install/mysql/migration/repair.sql
    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/e0b4bd9b0dbe...f115501ddf2f