Commit Graph

43078 Commits

Author SHA1 Message Date
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
c64ffb3087 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-07 11:48:41 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
2014-08-07 11:48:19 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
Laurent Destailleur
6d49259999 Exclude nltechno dir 2014-08-06 23:57:25 +02:00
Laurent Destailleur
f1ca5b3eea Exclude vagrant dir 2014-08-06 23:55:07 +02:00
Laurent Destailleur
20cef1512f Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 21:34:47 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Laurent Destailleur
d694b10274 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-06 17:15:50 +02:00
KreizIT
180cc0b200 Add description for new param 2014-08-06 17:12:28 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
KreizIT
cfe35f32e8 - Add improvement to GETPOST function
- Review thirdparty cards for illustration of new GETPOST functionality
2014-08-06 15:59:36 +02:00
Maxime Kohlhaas
546b31b9d0 Fix : Filtering on fourn paiement list was not working 2014-08-06 12:02:44 +02:00
Maxime Kohlhaas
27266ba7e1 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-06 11:53:56 +02:00
Laurent Destailleur
e52d8a609f Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 11:01:43 +02:00
Laurent Destailleur
74d9ada517 Fix: Clean init data 2014-08-06 10:59:09 +02:00
Laurent Destailleur
544e75c2a1 Fix: Clean init data 2014-08-06 10:57:35 +02:00
Laurent Destailleur
bf9ec22cd0 Fix: Clean init data 2014-08-06 10:57:26 +02:00
Laurent Destailleur
9c6222a776 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 10:54:31 +02:00
Laurent Destailleur
338c4543fc Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:52:57 +02:00
Laurent Destailleur
098c5febd5 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:51:16 +02:00
Laurent Destailleur
272c438431 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:49:22 +02:00
Laurent Destailleur
800ded40d3 Fix: Removed table of external modules 2014-08-06 10:40:26 +02:00
Laurent Destailleur
d8fe7b904e Fix: Removed table of external modules 2014-08-06 10:38:14 +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
65b7f3d744 Fix: Clean data init 2014-08-06 10:18:32 +02:00
Laurent Destailleur
8c25fdfd2c Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:16:25 +02:00
Laurent Destailleur
86f4b874eb Fix: Clean data init 2014-08-06 10:15:32 +02:00
Laurent Destailleur
7f0baa3d65 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:12:47 +02:00
Laurent Destailleur
bb201010e5 Fix: Clean data init 2014-08-06 10:12:02 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Laurent Destailleur
069cf61d72 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-08-06 10:03:50 +02:00
Laurent Destailleur
0e2de54660 Fix: Clean data init 2014-08-06 10:02:02 +02:00
Maxime Kohlhaas
5e63f16d32 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Conflicts:
	ChangeLog
2014-08-06 09:58:10 +02:00
Maxime Kohlhaas
3622b472dd Changelog 2014-08-06 09:57:20 +02:00
Laurent Destailleur
cffc92a5c0 Fix: PHPCS 2014-08-06 09:46:09 +02:00
Laurent Destailleur
82921232f5 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
2014-08-06 09:27:01 +02:00
Laurent Destailleur
238bd76eb6 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 09:24:22 +02:00
Laurent Destailleur
f91e847562 Qual: Removed had coded value for version. 2014-08-06 09:23:37 +02:00
Laurent Destailleur
2169a8668d Fix: PHPCS 2014-08-06 09:18:44 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/holiday/fiche.php
2014-08-06 09:12:29 +02:00
Laurent Destailleur
2d524f2edc Fix: Holiday module was broken. Initializaion of amount of holidays
failed.
2014-08-06 09:09:22 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore.
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2014-08-06 09:08:28 +02:00
Maxime Kohlhaas
3499c69b7d Fix : search contact by phone was mistaking phone pro and phone perso 2014-08-06 08:54:22 +02:00
Laurent Destailleur
4bd257f007 New: Work on type of leave. 2014-08-06 03:23:16 +02:00
Laurent Destailleur
bbb58dd365 New: Add navigation on year on page of leaves. 2014-08-06 03:09:59 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00