lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,304 Commits 43 Branches 150 Tags 886 MiB
3.8
Commit Graph

550 Commits

Author SHA1 Message Date
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
e3f96802fb Fix: sql bad use. 
Qual: Incrase sql syntax test by phpunit to migration scripts. 
Qual: Removed old migration script before 3.0.0
 2014-08-14 00:09:09 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
Marcos García de La Fuente
42c7fc1c8d Revert "Testing dol_json_encode is not interesting now as it uses a core function" 2014-07-30 15:19:31 +02:00
Laurent Destailleur
36c4d272e7 Fix: phpunit test 2014-07-30 08:45:10 +02:00
Marcos García de La Fuente
5baf48fc15 Revert "Removed empty test" 
This reverts commit cf1a2c44a3.
 2014-07-26 19:12:11 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
8f6023ab5f Fix: phpunit test 2014-07-26 14:07:37 +02:00
Marcos García de La Fuente
76725c61ed Created test for dol_nl2br 2014-07-22 04:10:42 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Laurent Destailleur
4f173d095c Qual: Add php unit for function is_ip 2014-07-20 13:32:06 +02:00
Marcos García de La Fuente
a6275181ec Corrected testIsValidUrl 2014-07-20 10:20:05 +02:00
Marcos García de La Fuente
cf1a2c44a3 Removed empty test 2014-07-20 08:33:56 +02:00
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Marcos García de La Fuente
3e160fb209 Testing dol_json_encode is not interesting now as it uses a core function 2014-07-18 12:05:03 +02:00
Marcos García de La Fuente
a3ceb2a970 Added a test for isValidUrl function 2014-07-18 12:01:19 +02:00
Marcos García de La Fuente
0c4a3b23af Corrected test 2014-07-18 03:52:30 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
Laurent Destailleur
9b6b5feb4f Fix: ON DELETE CASCADE is forbidden. 2014-07-08 21:38:20 +02:00
Laurent Destailleur
932206a152 Fix: phpunit 2014-07-08 21:04:17 +02:00
Laurent Destailleur
c1431bdf93 Fix: Typo 2014-05-31 14:22:19 +02:00
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
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Laurent Destailleur
01e3e13865 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php
 2014-05-18 11:59:51 +02:00
Laurent Destailleur
0e13ded641 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
 2014-05-18 11:57:18 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
1b25fdc323 Fix: Param at wrong place. 
Fix: Add warning if phpunit are runned with external module on.
 2014-05-08 18:09:39 +02:00
Laurent Destailleur
70cccc907a Fix: Check env before test to be sure module ecotax is not enabled 
(this change result).
 2014-05-08 15:30:31 +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
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
b990d1e891 Fix: testcase to get thirdparty from web service. 2014-05-04 17:33:57 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
02112fc969 Fix: Bad name of phpunit file 2014-05-03 02:25:55 +02:00
Laurent Destailleur
659891ac5b Fix: doxygen 2014-05-03 02:24:32 +02:00
Laurent Destailleur
f5b0651809 New: Add webservcie to delete a product. 
Qual: More webservices in phpunit.
 2014-05-02 16:47:54 +02:00
Laurent Destailleur
7216b2a843 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:27 +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
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
8b1dae29f7 Try to test without AutoLoad that make travis fails. 2014-05-01 16:38:41 +02:00
Laurent Destailleur
df6e580dfb Qual: Add phpunit for dolexplodeintoarray function 2014-04-16 15:16:33 +02:00
Laurent Destailleur
2035e6e648 Fix: The " " is not more allowed as value for SeparatorThousand. We must 
use "Space". This solve a lot of problem into translation process.
 2014-04-07 13:08:04 +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
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
a884673637 Fix: A better to fix to manage automatic creation of code for import. 2014-03-21 13:29:13 +01:00
Laurent Destailleur
e7e5a93906 Qual: More PHPUnit tests 2014-03-17 15:01:47 +01:00
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +01:00
Maxime Kohlhaas
233a8fa917 Add new PHPUnit test on Entrepot 2014-03-16 11:38:39 +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
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
a0e0d17725 Qual: More PHP unit to test dol_escapejs function. 
Qual: More PHP unit to test FormAdmin class.
 2014-02-17 15:40:04 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
e1efd88155 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-02-17 15:22:02 +01:00
Laurent Destailleur
8839ae38d3 Fix: [ bug #1241 ] error in request in select_paper file 
/core/class/html.formadmin.class.php
 2014-02-17 15:21:19 +01:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
5b6b8f1d5b Fix: Support for reset everymonth (@99 into numbering mask) was ko when 
changing year.
 2014-01-20 11:20:38 +01:00
Laurent Destailleur
7809e0baa9 Fix: dol_htmlentitiesbr behaviour was different if input was html 
or not. Add phpunit test to avoid that in future.
 2014-01-10 01:25:28 +01:00
Laurent Destailleur
0876e2cf3f Qual: Add phpunit test for paypal module 2014-01-07 17:48:01 +01:00
Laurent Destailleur
b37aec2027 Fix: bad include 2013-12-16 14:43:16 +01:00
Laurent Destailleur
c1ee59eef9 Qual: Add phpunit tests for margin lib 2013-12-16 14:10:52 +01:00
Laurent Destailleur
dc1ccbfae8 Fix: [ bug #1177 ] Error on create domiciliation 2013-12-14 15:40:43 +01:00
Laurent Destailleur
c92d0fe966 Fix: phpunit 2013-11-19 23:06:25 +01:00
Laurent Destailleur
afa5bdb837 Fix: phpunit error 2013-11-18 00:12:13 +01:00
Laurent Destailleur
56867b6fd9 Fix: Removed duplicate tests 2013-11-17 23:45:17 +01:00
Peter Fontaine
3d7d8c7d5d add tests 
add default_rib column in mysqldump
 2013-11-14 10:48:36 +01:00
Laurent Destailleur
6e37e75755 More complete test case 2013-10-23 17:44:54 +02:00
Laurent Destailleur
cb510f7c46 Fix: Travis 2013-10-18 18:51:53 +02:00
Laurent Destailleur
c9012b498f Fix: Code comment and phpunit test 2013-10-18 17:34:12 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
de97cd1812 Fix: json 2013-10-11 18:33:21 +02:00
Laurent Destailleur
692ca4473d Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 20:04:30 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
04752dbfbe Doxygen: More comments 2013-09-18 17:59:57 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
30d2af26f8 Fix: phpunit test 2013-09-11 14:26:25 +02:00
Laurent Destailleur
0bb18cb05c New: Can use tag {mm} before {yy} even when there is a reset into 
numbering masks.
Qual: Enhance phpunit tests to include this case.
 2013-09-11 14:18:56 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Laurent Destailleur
7670ed5ae0 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	test/phpunit/PdfDocTest.php
 2013-09-09 19:55:07 +02:00
Laurent Destailleur
574c4373b4 Fix: bug with php 5.4 2013-09-09 19:53:35 +02:00
Laurent Destailleur
e932bef031 Fix: Bug with php 5.4 2013-09-09 17:50:42 +02:00
Laurent Destailleur
8b904e9f5c Better phpunit test for web services 2013-09-09 11:46:45 +02:00
Laurent Destailleur
53cfb04995 Fix: do not compare on date that may differ if cpu too slow 2013-09-09 03:48:58 +02:00
Laurent Destailleur
e2b8ad2035 Fix: not defined value 2013-09-09 03:43:59 +02:00
Laurent Destailleur
94b6defd8c Update doc 2013-09-09 03:23:56 +02:00
Laurent Destailleur
ebfa63adf5 Fix: phpunit 2013-09-09 02:58:09 +02:00
Laurent Destailleur
8114702a8e Fix: phpunit for 3.5 2013-09-09 02:52:44 +02:00
Laurent Destailleur
fc96ff31af Fix: phpunit 2013-09-09 02:46:48 +02:00
Laurent Destailleur
1be6139e21 Remove useless dir 2013-09-09 02:15:56 +02:00
Laurent Destailleur
42722fe7a2 More log into phpunit 2013-09-09 00:47:43 +02:00
Laurent Destailleur
dad617c506 PHPUnit tests 2013-09-08 23:38:55 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
fbd3f6e67f Fix: Maxi debug of scripts 2013-07-31 12:33:18 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
f169984c7c Better test 2013-07-13 20:22:17 +02:00
Laurent Destailleur
158a2b8ca8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/.gitignore
 2013-07-11 11:52:32 +02:00
Laurent Destailleur
8d1b86db49 Qual: Add method addline 2013-07-10 15:58:07 +02:00
Laurent Destailleur
fee1682671 Add missing modules 2013-07-09 15:24:50 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of 
sum instead of sum of rounding
 2013-07-04 00:11:40 +02:00
Laurent Destailleur
cb68924f34 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
 2013-07-02 01:10:06 +02:00
Laurent Destailleur
d09e8a522d Fix: PHPunit match previous fix of civility label empty 2013-07-02 01:05:10 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS 
Fix: create member was missing field import_key
New: Uniformize code
 2013-06-27 17:45:58 +02:00
Laurent Destailleur
11ffe3b7b9 Merge pull request #1032 from marcosgdf/develop 
CR Fix
 2013-06-09 07:57:37 -07:00
Laurent Destailleur
9bb539843f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 16:14:19 +02:00
Laurent Destailleur
a5f401f913 Fix: phpunit file 2013-06-09 16:13:59 +02:00
Laurent Destailleur
1eb2fc9fbd Fix: phpunit file 2013-06-09 16:13:24 +02:00
Marcos García
0abcea745e CR Fix 
Git required me to commit these changes
 2013-06-09 15:47:03 +02:00
Laurent Destailleur
89ee79f5cf New: Implement same rule for return value of all command line scripts (0 
when success, <>0 if error).
 2013-06-09 14:40:33 +02:00
Marcos García
532c56002d Entities problem with error message in predefined invoice creation 2013-06-08 19:07:13 +02:00
Marcos García
5069177f46 CR fix 2013-06-08 19:02:00 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-06-06 21:25:10 +02:00
Laurent Destailleur
31fe378f3b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.
 2013-06-06 21:18:50 +02:00
Raphaël Doursenaud
686f5add82 Normalized line endings to LF 2013-06-05 16:12:07 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
67758c963b Fix: PHPUnit tests 2013-06-04 22:52:58 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob. 
Conflicts:
	test/phpunit/FilesLibTest.php
 2013-04-30 22:52:56 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
761b2d05d4 Fix: delete of files with [ and glob. 2013-04-30 17:24:11 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	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/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
ff3b2933a8 Fix: Removed bad test 2013-04-23 10:42:10 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
ff2adc40a4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/dict.php
	htdocs/comm/prospect/fiche.php
 2013-04-17 23:15:57 +02:00
Laurent Destailleur
3a474a22ca Qual: Include is_erasable() into test 
Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-04-16 15:56:08 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function. 
Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-04-16 15:54:36 +02:00
Laurent Destailleur
5b110ebae9 Qual: Include is_erasable() into test 2013-04-16 15:49:00 +02:00