[Dolibarr-git] [Dolibarr/dolibarr] 2af7fd: Task 714

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2af7fd858e387513f043f02abed6b897ba2cf0c3
      
https://github.com/Dolibarr/dolibarr/commit/2af7fd858e387513f043f02abed6b897ba2cf0c3
  Author: fhenry <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M htdocs/admin/mailing.php

  Log Message:
  -----------
  Task 714


  Commit: ebf002d79ebaa04601db42fecfc8d419a9a4aef3
      
https://github.com/Dolibarr/dolibarr/commit/ebf002d79ebaa04601db42fecfc8d419a9a4aef3
  Author: fhenry <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/const.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.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/2.0.0-2.1.0.sql
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_contratdet.sql
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


  Commit: d41e754f43b69fbe6e0230cd759afe3d16855cfe
      
https://github.com/Dolibarr/dolibarr/commit/d41e754f43b69fbe6e0230cd759afe3d16855cfe
  Author: fhenry <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Fix bug on task 350


  Commit: f65f0e3f11f658241fbca369ed198d5b6eaaad2b
      
https://github.com/Dolibarr/dolibarr/commit/f65f0e3f11f658241fbca369ed198d5b6eaaad2b
  Author: fhenry <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Remove debug string in buf correction of task 350


  Commit: 4dca883f21f2e97074d059c6dc68046e8c6f2798
      
https://github.com/Dolibarr/dolibarr/commit/4dca883f21f2e97074d059c6dc68046e8c6f2798
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M htdocs/admin/mailing.php
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Merge pull request #655 from FHenry/develop

Task 714 and    Fix bug on task 350


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2ea62073b62b...4dca883f21f2