[Dolibarr-git] [Dolibarr/dolibarr] e37741: Merge pull request #4 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e37741c114ee294a82f7594d70f63eb556b40480
      
https://github.com/Dolibarr/dolibarr/commit/e37741c114ee294a82f7594d70f63eb556b40480
  Author: Teddy <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M htdocs/admin/security.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/dons/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/date.lib.php
    A htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/list.php
    M htdocs/holiday/index.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge pull request #4 from Dolibarr/develop

Merge pull request #4 from Dolibarr/develop


  Commit: 5742e42689a8090fa92818022689e9c30a34621e
      
https://github.com/Dolibarr/dolibarr/commit/5742e42689a8090fa92818022689e9c30a34621e
  Author: Andrelec1 <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Fix require FormOther !

If agenda module is desable


  Commit: e05201094185bf72e4cccf519b958b1d40bbdde9
      
https://github.com/Dolibarr/dolibarr/commit/e05201094185bf72e4cccf519b958b1d40bbdde9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #2004 from Devensys/Develop-FixErrorFormOther

fix error FormOther in user/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5e0946bdc287...e05201094185