[Dolibarr-git] [Dolibarr/dolibarr] fee168: Add missing modules

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fee1682671fdba5440fc1a5b42ab2f40ad59b019
      
https://github.com/Dolibarr/dolibarr/commit/fee1682671fdba5440fc1a5b42ab2f40ad59b019
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M test/phpunit/ModulesTest.php

  Log Message:
  -----------
  Add missing modules


  Commit: 752bc0ccff30030c0816098b56b611a5638eae9e
      
https://github.com/Dolibarr/dolibarr/commit/752bc0ccff30030c0816098b56b611a5638eae9e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M htdocs/.gitignore
    M htdocs/admin/system/perf.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  Work on tool for performance advice.


  Commit: 158a2b8ca8e0fd0e3cc8c649b0e0dae9102e5460
      
https://github.com/Dolibarr/dolibarr/commit/158a2b8ca8e0fd0e3cc8c649b0e0dae9102e5460
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M ChangeLog
    M dev/initdata/generate-commande.php
    M dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M htdocs/.gitignore
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cotisations.php
    M htdocs/admin/agenda.php
    M htdocs/admin/pdf.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/conf/conf.php.example
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/liste.php
    M htdocs/install/mysql/data/llx_c_action_trigger.sql
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/master.inc.php
    M htdocs/product/fiche.php
    M test/phpunit/PropalTest.php

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

Conflicts:
        htdocs/.gitignore


  Commit: 7485192cfbca23027d10cfdc41a33a14f332d23c
      
https://github.com/Dolibarr/dolibarr/commit/7485192cfbca23027d10cfdc41a33a14f332d23c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/es_ES/compta.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/442ca8ea35da...7485192cfbca