Laurent Destailleur
|
ccca46f380
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
|
2014-05-29 19:20:48 +02:00 |
|
Laurent Destailleur
|
872e764c94
|
Fix: html detection was not working with hx tags.
|
2014-05-24 14:57:41 +02:00 |
|
Laurent Destailleur
|
7bfbc4cbf3
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
|
2014-05-07 19:30:19 +02:00 |
|
Laurent Destailleur
|
1bc3558307
|
Fix: Better html detection
|
2014-05-07 19:06:15 +02:00 |
|
Laurent Destailleur
|
9f795331f5
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
|
2014-05-06 23:58:17 +02:00 |
|
Laurent Destailleur
|
876a35d1a1
|
Fix phpunit to be compatible with new version of phpunit
|
2014-05-02 00:08:19 +02:00 |
|
Laurent Destailleur
|
19fb5e5085
|
Try to fix phpunit error with new version.
|
2014-05-01 19:57:53 +02:00 |
|
Laurent Destailleur
|
df6e580dfb
|
Qual: Add phpunit for dolexplodeintoarray function
|
2014-04-16 15:16:33 +02:00 |
|
Laurent Destailleur
|
24dbfbba60
|
Qual: Still working on cleaning code for timezone management.
|
2014-03-21 18:05:08 +01:00 |
|
Laurent Destailleur
|
73682baff0
|
Fix: Use correct vat rate into text cases.
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
|
2014-03-21 16:22:41 +01:00 |
|
Laurent Destailleur
|
bdb2b7a547
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
|
2014-03-13 09:20:05 +01:00 |
|
Laurent Destailleur
|
7684e9e4f7
|
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX
|
2014-03-11 23:39:26 +01:00 |
|