Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
43,243 Commits 36 Branches 189 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

430 Commits

Author SHA1 Message Date
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
Laurent Destailleur
4fe49b6736 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196 Fix: bug into is_erasable function. 2013-04-16 15:00:41 +02:00
Laurent Destailleur
a11c771993 Qual: More PHPUnit tests 2013-04-16 13:34:37 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
67052933ca Fix: PHPUnit 2013-04-14 23:42:24 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
b3f9fbb3bc Update case after mutualizing code. 2013-04-07 18:07:16 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
Laurent Destailleur
df08d838d7 More robust phpunit tests 2013-04-01 14:49:33 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
eff675793d Qual: Show skeletons to add phpunit for webservices 2013-03-01 23:51:36 +01:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
529b8ae38e english standardization 2013-02-23 10:43:16 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
060edf21da New: Add more PHPUnit tests to prepare removal of adodb. 2013-01-18 15:54:40 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00