dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 7216b2: Fix phpunit to be compatible


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 7216b2: Fix phpunit to be compatible with new version of p...
Date: Wed, 21 May 2014 11:33:30 -0700

  Branch: refs/heads/3.5_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7216b2a84373e11536825d9afd2736a4f182fa0a
      
https://github.com/Dolibarr/dolibarr/commit/7216b2a84373e11536825d9afd2736a4f182fa0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-02 (Fri, 02 May 2014)

  Changed paths:
    M test/phpunit/AdherentTest.php
    M test/phpunit/AdminLibTest.php
    M test/phpunit/AllTests.php
    M test/phpunit/BankAccountTest.php
    M test/phpunit/BuildDocTest.php
    M test/phpunit/CMailFileTest.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/ChargeSocialesTest.php
    M test/phpunit/CommandeFournisseurTest.php
    M test/phpunit/CommandeTest.php
    M test/phpunit/CommonObjectTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/ContactTest.php
    M test/phpunit/ContratTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/DiscountTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureFournisseurTest.php
    M test/phpunit/FactureRecTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/FormAdminTest.php
    M test/phpunit/Functions2Test.php
    M test/phpunit/FunctionsTest.php
    M test/phpunit/HolidayTest.php
    M test/phpunit/ImagesLibTest.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/PdfDocTest.php
    M test/phpunit/PgsqlTest.php
    M test/phpunit/PricesTest.php
    M test/phpunit/ProductTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/SecurityTest.php
    M test/phpunit/SocieteTest.php
    M test/phpunit/UserGroupTest.php
    M test/phpunit/UserTest.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

  Log Message:
  -----------
  Fix phpunit to be compatible with new version of phpunit


  Commit: c2370f352b0cb610b63c85c802c01954e57d534b
      
https://github.com/Dolibarr/dolibarr/commit/c2370f352b0cb610b63c85c802c01954e57d534b
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-16 (Fri, 16 May 2014)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  escape for insert SQL expedition module


  Commit: 0e13ded641a91bdea5c85b0800f75cf1989690ef
      
https://github.com/Dolibarr/dolibarr/commit/0e13ded641a91bdea5c85b0800f75cf1989690ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-18 (Sun, 18 May 2014)

  Changed paths:
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        test/phpunit/CoreTest.php
        test/phpunit/Functions2Test.php
        test/phpunit/FunctionsTest.php


  Commit: 5709179cf03f8a9aa41bacdc247374d431fb24e8
      
https://github.com/Dolibarr/dolibarr/commit/5709179cf03f8a9aa41bacdc247374d431fb24e8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M htdocs/admin/boxes.php

  Log Message:
  -----------
  Fix: Box was not added on correct side


  Commit: 56415400eb653eb44f2b24eecb3d8dab470f04b3
      
https://github.com/Dolibarr/dolibarr/commit/56415400eb653eb44f2b24eecb3d8dab470f04b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge pull request #1606 from FHenry/3.5

escape for insert SQL expedition module


  Commit: 5a5c8585782afb485671e04aed94f164192012ed
      
https://github.com/Dolibarr/dolibarr/commit/5a5c8585782afb485671e04aed94f164192012ed
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
   [ bug #1399 ] [pgsql] Silent warning when setting a propal as
"facturée" in propal.php


  Commit: ff1eb983c8b51b318eb104ec9093626fbc32c96b
      
https://github.com/Dolibarr/dolibarr/commit/ff1eb983c8b51b318eb104ec9093626fbc32c96b
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M htdocs/admin/boxes.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

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


  Commit: 753ef28168ded4280bdfb5154ca4645e1e36c6aa
      
https://github.com/Dolibarr/dolibarr/commit/753ef28168ded4280bdfb5154ca4645e1e36c6aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix: Data are clean once registered into dictionnaries.


  Commit: 366bd64c4f0c5e006e269e58f39ad701d70c7890
      
https://github.com/Dolibarr/dolibarr/commit/366bd64c4f0c5e006e269e58f39ad701d70c7890
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

  Log Message:
  -----------
  Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/boxes.php
    M htdocs/commande/class/commande.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/facture/fiche.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

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


  Commit: 4a89446162fa55d982ba0def71ac0e53db0890ba
      
https://github.com/Dolibarr/dolibarr/commit/4a89446162fa55d982ba0def71ac0e53db0890ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

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

Conflicts:
        ChangeLog


  Commit: 4a7e9e4d0b97b35a71d5b5e3a796cceb6cee2ce9
      
https://github.com/Dolibarr/dolibarr/commit/4a7e9e4d0b97b35a71d5b5e3a796cceb6cee2ce9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

  Log Message:
  -----------
  Fix: CRLF


  Commit: 8ad453168b254d51ce4437097a8be522875bdbb9
      
https://github.com/Dolibarr/dolibarr/commit/8ad453168b254d51ce4437097a8be522875bdbb9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/boxes.php
    M htdocs/admin/dict.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/expedition/class/expedition.class.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.5_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6354b4c26857...8ad453168b25

reply via email to

[Prev in Thread] Current Thread [Next in Thread]