Laurent Destailleur
|
f6a9597507
|
Merge pull request #3959 from aspangaro/develop-hrm
HRM: Correct getNomUrl
|
2015-11-11 18:32:14 +01:00 |
|
Laurent Destailleur
|
ca62689a96
|
Merge pull request #3961 from frederic34/escpos
Escpos : install lib with composer
|
2015-11-11 18:30:57 +01:00 |
|
frederic34
|
954291ae0b
|
re-add library escpos
|
2015-11-11 18:02:47 +01:00 |
|
frederic34
|
765e83d456
|
delete directory
|
2015-11-11 18:01:13 +01:00 |
|
frederic34
|
e107f6d28a
|
Try to restore escpos
|
2015-11-11 17:49:37 +01:00 |
|
frederic34
|
cd738ef483
|
Merge remote branch 'upstream/develop' into fccard
Conflicts:
htdocs/commande/card.php
|
2015-11-11 17:23:37 +01:00 |
|
frederic34
|
01d4bd6cf5
|
bad invert
|
2015-11-11 17:19:53 +01:00 |
|
Laurent Destailleur
|
21ca7dc823
|
Merge pull request #3960 from aspangaro/develop-hrm2
HRM: Add fk_establishment in llx_user to link an user to an establish…
|
2015-11-11 17:08:42 +01:00 |
|
Laurent Destailleur
|
59a79442b0
|
Enhance code for select field list feature.
Add gender and employee on user list.
|
2015-11-11 17:05:18 +01:00 |
|
Laurent Destailleur
|
f7f3e16679
|
I prefer monthly stats
|
2015-11-11 16:08:21 +01:00 |
|
Laurent Destailleur
|
db6dff998d
|
Update README
|
2015-11-11 16:02:41 +01:00 |
|
Laurent Destailleur
|
350cae4e44
|
Use absolute path into README because README file is also used by
other tools, repositories.
|
2015-11-11 15:59:51 +01:00 |
|
Laurent Destailleur
|
d5361dd422
|
Try an absolute path into README because README file is also used by
other tools, repositories.
|
2015-11-11 15:56:05 +01:00 |
|
Laurent Destailleur
|
4ddfa6e1b5
|
Merge pull request #3956 from frederic34/patch-3
Update product.php
|
2015-11-11 15:51:09 +01:00 |
|
Laurent Destailleur
|
a0606cece9
|
Merge pull request #3955 from grandoc/develop
[Qual] Uniformize code
|
2015-11-11 15:50:48 +01:00 |
|
Christophe Battarel
|
cc35f2b738
|
Merge branch 'develop' into customerinfos
|
2015-11-11 15:46:22 +01:00 |
|
aspangaro
|
05b0ab2eab
|
HRM: Add fk_establishment in llx_user to link an user to an establishment
|
2015-11-11 15:45:55 +01:00 |
|
aspangaro
|
bbab5e5bc3
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
|
2015-11-11 15:38:52 +01:00 |
|
Laurent Destailleur
|
e673b18871
|
Merge pull request #3949 from marcosgdf/bug-3865
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
|
2015-11-11 15:36:34 +01:00 |
|
Christophe Battarel
|
0c40a6dda5
|
add hidden constant
|
2015-11-11 15:32:42 +01:00 |
|
aspangaro
|
54091a0661
|
Correct getNomUrl
|
2015-11-11 15:31:39 +01:00 |
|
Laurent Destailleur
|
47ce8baadc
|
Merge pull request #3958 from aspangaro/develop-hrm
HRM: Update work
|
2015-11-11 15:28:14 +01:00 |
|
philippe grand
|
12c5d02a7a
|
[Qual] Uniformize code
|
2015-11-11 12:27:09 +01:00 |
|
aspangaro
|
e157d8b8d2
|
Update for fk_country
|
2015-11-11 08:52:28 +01:00 |
|
aspangaro
|
ca0c68a8e2
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
|
2015-11-11 08:20:12 +01:00 |
|
aspangaro
|
e1b329e80a
|
HRM: Update work
|
2015-11-11 08:16:06 +01:00 |
|
Frédéric FRANCE
|
2799dbf45b
|
Update product.php
|
2015-11-10 23:02:54 +01:00 |
|
philippe grand
|
d06a445e01
|
[Qual] Uniformize code
|
2015-11-10 19:22:27 +01:00 |
|
Laurent Destailleur
|
13a0fa2c69
|
Missing css
|
2015-11-10 15:50:13 +01:00 |
|
Laurent Destailleur
|
b0419557b1
|
Exclude dir
|
2015-11-10 00:37:30 +01:00 |
|
Laurent Destailleur
|
98c32fa1ec
|
FIX The label hidden was not supported when using jmobile
|
2015-11-10 00:36:33 +01:00 |
|
Alexis Algoud
|
99513ac9f3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
|
2015-11-09 18:31:21 +01:00 |
|
frederic34
|
b8a84d68ec
|
add messages
|
2015-11-09 18:19:10 +01:00 |
|
Alexis Algoud
|
68cbd4699b
|
NEW multi event type for filter and get form in order to allow bookmark
|
2015-11-09 17:18:23 +01:00 |
|
Laurent Destailleur
|
19684f9a36
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-09 16:48:41 +01:00 |
|
Laurent Destailleur
|
f49fab8a7e
|
Rename some files in english and increase fields size.
|
2015-11-09 16:48:30 +01:00 |
|
Raphaël Doursenaud
|
c3ed30ffd8
|
Moved to new package for TCPDF
Previous one has been deprecated by upstream
|
2015-11-09 12:21:08 +01:00 |
|
Raphaël Doursenaud
|
93d6ae3c16
|
Ignore composer autoloader and binaries
@eldy is against those. Let's follow the leader…
|
2015-11-09 12:20:16 +01:00 |
|
Raphaël Doursenaud
|
e5915ce8d9
|
Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
|
2015-11-09 12:19:48 +01:00 |
|
Raphaël Doursenaud
|
0e155be4e8
|
Reinstall ckeditor with composer
This time using the correct full package
Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
|
2015-11-09 12:18:50 +01:00 |
|
Raphaël Doursenaud
|
442431704b
|
Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
|
2015-11-09 12:16:04 +01:00 |
|
Raphaël Doursenaud
|
7c44198022
|
[Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
|
2015-11-09 12:12:05 +01:00 |
|
Marcos García de La Fuente
|
80ef746348
|
Reverted unwanted changes
|
2015-11-08 19:23:02 +01:00 |
|
Laurent Destailleur
|
71fa347e8e
|
FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
|
2015-11-08 18:40:12 +01:00 |
|
Marcos García de La Fuente
|
9cdf45e0a6
|
Fixed JS compatibility with multiprices price generator
|
2015-11-08 16:54:54 +01:00 |
|
Marcos García de La Fuente
|
9bc4b9f0bc
|
Moved update function after updatePrice
|
2015-11-08 16:45:42 +01:00 |
|
Marcos García de La Fuente
|
7ebe032d6f
|
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
|
2015-11-08 16:01:12 +01:00 |
|
Laurent Destailleur
|
096ec3100d
|
Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
|
2015-11-08 15:49:33 +01:00 |
|
Laurent Destailleur
|
6ec33a94c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-08 15:39:10 +01:00 |
|
Laurent Destailleur
|
bd56396394
|
Fix migration error
|
2015-11-08 15:38:57 +01:00 |
|