lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,374 Commits 43 Branches 150 Tags 886 MiB
94ea9f3c55
Commit Graph

30374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
94ea9f3c55 Fix: uniform code 2012-01-13 18:24:25 +01:00
Regis Houssin
d5131b0e16 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal.php
 2012-01-13 17:48:02 +01:00
Regis Houssin
9fe45c4f4f Fix: uniform code 2012-01-13 17:46:15 +01:00
Regis Houssin
7363b39c17 Fix: uniform code 2012-01-13 17:40:52 +01:00
Regis Houssin
d328fd94dd Merge pull request #88 from cbattarel/develop 
ajoute la possibilité de visualiser la description des produits dans la ...
 2012-01-13 08:04:42 -08:00
Christophe Battarel
69c9edbeb3 ajoute la possibilité de visualiser la description des produits dans la langue du client lors de l'jout de lignes dans les commandes/propales/factures 2012-01-13 16:53:28 +01:00
Regis Houssin
66bfaf8530 Fix: custom language file was not loaded 2012-01-13 12:17:41 +01:00
Regis Houssin
8ccc7acf28 Fix: add all phones if create user from contact 2012-01-13 11:25:48 +01:00
Regis Houssin
b069d6d2f1 Fix: use getEntity for shared values between entities 2012-01-13 00:23:03 +08:00
Regis Houssin
b2ae52d7ee Merge pull request #87 from daamien/develop 
Fix for the bug #278 (to be tested on MySQL)
 2012-01-12 06:30:15 -08:00
damien
dd1a31ded1 Fix for the bug #278 (to be tested on MySQL) 2012-01-12 14:04:24 +01:00
Regis Houssin
8adac462fa Fix: share customer code with a referent entity 2012-01-12 18:51:40 +08:00
Laurent Destailleur
39a522c1a1 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-12 10:27:16 +01:00
Laurent Destailleur
8974705332 Fix more complete 2012-01-12 10:26:46 +01:00
Regis Houssin
2586b8ce98 Fix: remove delta (all values are string instead float) 2012-01-12 10:04:48 +01:00
Regis Houssin
e0552ce355 Fix: add a delta 2012-01-12 09:59:13 +01:00
Laurent Destailleur
27568ad82f Try to uniformize this setup too. 2012-01-12 09:58:31 +01:00
Laurent Destailleur
14ab1de5cd Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-12 09:55:15 +01:00
Laurent Destailleur
0861ed36c9 Fix: Try a fix to be sure function returns an exact value not depending 
on float management.
 2012-01-12 09:54:18 +01:00
Regis Houssin
d45a473d22 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	test/phpunit/PricesTest.php
 2012-01-12 09:35:46 +01:00
Regis Houssin
d79c9dd17e Fix: add logs 2012-01-12 09:31:45 +01:00
Regis Houssin
84d1ef2a8f Fix: float to string 2012-01-12 09:10:49 +01:00
Regis Houssin
84fd74b1c7 Try to fix unit test 2012-01-12 09:04:20 +01:00
Regis Houssin
aa66a630e4 Fix: custom directories not in official repository but is used in 
personnal phpunit test
 2012-01-12 08:31:05 +01:00
Laurent Destailleur
6c9cbae1f7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-11 22:21:14 +01:00
Regis Houssin
303521d14c New: add possibility to disable or show/hide another elements 2012-01-12 04:18:25 +08:00
Regis Houssin
72304505cb Fix: add htmlname parameter 2012-01-12 04:18:25 +08:00
Laurent Destailleur
b793b3887a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-11 20:32:14 +01:00
Laurent Destailleur
851abe00a9 New: Can attach files on social contributions 2012-01-11 20:31:40 +01:00
Laurent Destailleur
f8b2a2c774 New: Move mailman and spip feature into a specific module 2012-01-11 18:43:38 +01:00
Laurent Destailleur
a57295cc73 Qual: Add phpunit test before working on different rounding modes 2012-01-11 16:35:12 +01:00
Regis Houssin
6b727db3d0 Merge pull request #86 from simnandez/develop 
Fix: Label was not clear enough
 2012-01-11 07:02:35 -08:00
Regis Houssin
199e22fd70 Fix: remove useless code 2012-01-11 23:02:01 +08:00
Laurent Destailleur
c773e25c21 Add timeouts 2012-01-11 16:01:35 +01:00
simnandez
c1ac04866e Fix: Label was not clear enough 2012-01-11 15:59:46 +01:00
Laurent Destailleur
c7e39e3f8d Update phpunit setup 2012-01-11 15:28:53 +01:00
Regis Houssin
b670de36a9 Fix: add entity 0 for users and groups 2012-01-11 22:08:25 +08:00
Regis Houssin
5b04d47d6c Fix: remove useless global 2012-01-11 22:08:25 +08:00
Regis Houssin
9339119455 New: use getEntity() instead $conf->entity 2012-01-11 21:16:10 +08:00
Laurent Destailleur
4b1ac579f2 Try to unifromize config file. We will se if it's ok with jenkins. 2012-01-11 14:13:09 +01:00
Laurent Destailleur
2b9a118384 Fix: Bad date init 2012-01-11 13:47:47 +01:00
Laurent Destailleur
83d63aa07b Fix: Date not initialized 2012-01-11 13:42:44 +01:00
Laurent Destailleur
6b8d4391ac Try to uniformize config files 2012-01-11 13:42:27 +01:00
Laurent Destailleur
a7e7450dd7 Fix: Error management if date is empty 2012-01-11 13:37:50 +01:00
Laurent Destailleur
db77b43f9c Add more phpunit tests 2012-01-11 13:07:02 +01:00
Laurent Destailleur
aaefb82a33 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-11 12:03:06 +01:00
Laurent Destailleur
6c64d9732e Lines cleaner 2012-01-11 11:57:49 +01:00
Regis Houssin
033b290ed3 Qual: add $mc global object (multicompany) 2012-01-11 17:41:46 +08:00
Laurent Destailleur
9209c7c6bc Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-11 02:05:50 +01:00
Laurent Destailleur
5ff8c2b8fa Fix: Error management 2012-01-11 01:52:00 +01:00