Commit Graph

502 Commits

Author SHA1 Message Date
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