[Dolibarr-git] [Dolibarr/dolibarr] 387042: Merge branch '3.2' of ssh://address@hidden/Dolibar...

[Laurent Destailleur]

  Branch: refs/heads/3.2
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3870428f1673ec74dffae745c7a3fd9010c6cfcd
      
https://github.com/Dolibarr/dolibarr/commit/3870428f1673ec74dffae745c7a3fd9010c6cfcd
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M ChangeLog
  M build/debian/changelog
  M htdocs/admin/expedition.php
  M htdocs/admin/mailing.php
  M htdocs/comm/mailing/fiche.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/lib/pdf.lib.php
  M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
  M htdocs/fourn/class/fournisseur.commande.class.php
  M htdocs/fourn/commande/fiche.php
  M htdocs/install/check.php
  M htdocs/install/etape1.php
  M htdocs/install/etape2.php
  M htdocs/install/etape4.php
  M htdocs/install/etape5.php
  M htdocs/install/fileconf.php
  M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
  M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
  M htdocs/langs/en_US/mails.lang
  M htdocs/langs/fr_FR/mails.lang
  M scripts/emailings/mailing-send.php

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


  Commit: bb917bea0861f15165c9c4748b3eb0b91b2587ed
      
https://github.com/Dolibarr/dolibarr/commit/bb917bea0861f15165c9c4748b3eb0b91b2587ed
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M htdocs/admin/mailing.php
  M htdocs/comm/mailing/fiche.php
  M htdocs/langs/en_US/mails.lang
  M htdocs/langs/fr_FR/mails.lang
  M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Revert "Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read 
and unsubscribe in Admin part"

This reverts commit 2a12b2464437a87d2b4fdb6fb1de4ca92ce39480.


  Commit: 5aae71f9de9e343b2c6c478fe6ed16e24f427197
      
https://github.com/Dolibarr/dolibarr/commit/5aae71f9de9e343b2c6c478fe6ed16e24f427197
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Revert "to add delivery date"

This reverts commit b948ee1212eadc1d0e39deb1dc1fe03a955230c9.


  Commit: b141f3caf5c5fcb170f9f9dd4c61c1c00947da17
      
https://github.com/Dolibarr/dolibarr/commit/b141f3caf5c5fcb170f9f9dd4c61c1c00947da17
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
  M htdocs/fourn/commande/fiche.php
  M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
  M htdocs/install/mysql/tables/llx_commande_fournisseur.sql

  Log Message:
  -----------
  Revert "to add delivery date"

This reverts commit 8a20b670e7676d9dd386319165ea2ec1c78bda77.


  Commit: 1e526a2a03047f78320df7c5010389769327aea6
      
https://github.com/Dolibarr/dolibarr/commit/1e526a2a03047f78320df7c5010389769327aea6
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Revert "uniformise code"

This reverts commit 06761d97539c09feec6f92ed8f6ac6e9ec63a934.


Compare: https://github.com/Dolibarr/dolibarr/compare/307c010...1e526a2