Laurent Destailleur
e2e804e37a
Minor fix
2015-11-13 00:30:10 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
74a4006a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
b307431348
Add example of email header to use when sending email from thirdparty
...
card
2015-11-12 19:01:57 +01:00
Laurent Destailleur
60535086d4
Merge pull request #3965 from jpfox/patch-2
...
Correct pattern to match all odt var tags
2015-11-12 18:32:45 +01:00
Laurent Destailleur
8a26e27ef3
Merge pull request #3967 from grandoc/develop
...
[Qual] Uniformize code
2015-11-12 15:01:20 +01:00
Laurent Destailleur
3c70157a7a
Merge pull request #3963 from frederic34/patch-3
...
Typo
2015-11-12 15:00:48 +01:00
Laurent Destailleur
f49a33b600
Try a change for better compatibility with old search form
2015-11-12 12:22:21 +01:00
philippe grand
c712532bf6
[Qual] Uniformize code
2015-11-12 11:59:15 +01:00
Jean-Pierre Morfin
0cb9cc2213
Correct pattern to match all odt var tags
...
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
Frédéric FRANCE
a3e82f5a63
Typo
2015-11-11 20:17:43 +01:00
Laurent Destailleur
1f4742b77b
Remove useles html generated code. More code comment.
2015-11-11 19:38:19 +01:00
Laurent Destailleur
c05e623d97
Update rules to have a better conrol on external libraries and
...
dependencies addition
2015-11-11 19:18:19 +01:00
Laurent Destailleur
cb29f91434
FIX An external libray must contains also non obfuscated code into
...
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
a19f88b664
Merge branch 'GPCsolutions-dolibarr-php7' into develop
2015-11-11 19:05:18 +01:00
Laurent Destailleur
327d764284
Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
...
into GPCsolutions-dolibarr-php7
Conflicts:
.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
9ee06e8f0d
Merge pull request #3951 from frederic34/fccard
...
add messages
2015-11-11 18:32:30 +01:00
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
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
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
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +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
