[Dolibarr-git] [Dolibarr/dolibarr] 3e5ee3: Fix: PHPUnit tests are back.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3e5ee3b00ae0c4d387a086d37675df0b426be8eb
      
https://github.com/Dolibarr/dolibarr/commit/3e5ee3b00ae0c4d387a086d37675df0b426be8eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/filefunc.inc.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_holiday.sql
    M htdocs/master.inc.php
    M htdocs/societe/class/societe.class.php
    M test/phpunit/AllTests.php
    M test/phpunit/ContactTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/HolidayTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php
    M test/phpunit/WebservicesUserTest.php
    R test/phpunit/jenkins_phpunittest.xml
    M test/phpunit/phpunittest.xml

  Log Message:
  -----------
  Fix: PHPUnit tests are back.


  Commit: 60f16e1a887ccffcea9dd60f4ec13784c8152bf8
      
https://github.com/Dolibarr/dolibarr/commit/60f16e1a887ccffcea9dd60f4ec13784c8152bf8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/install/mysql/data/llx_c_action_trigger.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_c_action_trigger.key.sql
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/fr_FR/other.lang

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

Conflicts:
        htdocs/install/mysql/migration/3.3.0-3.4.0.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e03487f865a3...60f16e1a887c