Commit Graph

72556 Commits

Author SHA1 Message Date
Eric
71f7aa9503 use transnoentitiesnoconv instead of html_entity_decode 2019-01-20 20:55:59 +01:00
Eric
88efc830fe re enable export for expensereportsjournal 2019-01-20 15:25:53 +01:00
Eric
df5aa33022 add html_entity_decode on fields for export process (for example &acute -> é) 2019-01-20 15:25:24 +01:00
Eric
13586ff3d8 typo on my previus patch MainAccountForSupplierssNotDefined -> MainAccountForSuppliersNotDefined 2019-01-20 15:24:38 +01:00
Laurent Destailleur
43277cb630 Removed some warning 2019-01-20 13:22:04 +01:00
Laurent Destailleur
a46c90e1e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-19 15:34:01 +01:00
Laurent Destailleur
691deeb2c3 Add php7.3 in phpunit 2019-01-19 15:33:10 +01:00
Laurent Destailleur
5c825310a3 Fix bad link and css 2019-01-19 14:49:44 +01:00
Laurent Destailleur
b1e51835f5 Fix bad link and css 2019-01-19 14:49:26 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
f27f1f9d4a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-19 13:20:46 +01:00
Laurent Destailleur
0e843c56d0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-19 13:20:21 +01:00
Laurent Destailleur
1ac55b0800 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/security2.lib.php
2019-01-19 13:19:58 +01:00
Laurent Destailleur
55c90b0578 Fix #10359 cloning of proposal 2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
ptibogxiv
b3cbbc1b11 FIX lang for dolistore in module.php 2019-01-19 11:41:47 +01:00
Laurent Destailleur
f3d0c365d3
Merge pull request #10374 from ptibogxiv/patch-106
FIX lang for dolistore in module.php
2019-01-19 11:39:34 +01:00
wdammak
aaa61254ac Update stats.class.php
Fix div/0 warnings
2019-01-19 11:36:09 +01:00
wdammak
191900d258 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:35:16 +01:00
wdammak
13e7d18291 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:33:56 +01:00
Laurent Destailleur
22b01739d6
Merge pull request #10372 from wdammak/patch-21
Update stats.class.php
2019-01-19 11:32:16 +01:00
Laurent Destailleur
302a838673
Merge pull request #10365 from ptibogxiv/patch-89
NEW Add option DONATION_USE_THIRDPARTIES in admin of membership module
2019-01-19 11:25:25 +01:00
Laurent Destailleur
b0b7f53994
Merge pull request #10362 from ptibogxiv/patch-87
NEW save and display type of adherent in subscription for more explicit historic
2019-01-19 11:22:41 +01:00
Laurent Destailleur
4cf624e448
Merge pull request #10366 from ptibogxiv/patch-90
Fix: members.lang
2019-01-19 11:20:52 +01:00
ptibogxiv
ff99927f65
FIX lang for dolistore in module.php 2019-01-19 11:18:07 +01:00
Laurent Destailleur
0c452bd4e1
Merge pull request #10364 from ptibogxiv/patch-88
FIX lang libelle in list.php
2019-01-19 11:17:55 +01:00
Laurent Destailleur
6651407a05
Merge pull request #10367 from grandoc/new_branch_18_01_2019
update with html5 compliant code
2019-01-19 11:14:59 +01:00
Laurent Destailleur
325d2130b1
Merge pull request #10371 from ptibogxiv/patch-105
NEW add API REST for donations
2019-01-19 11:14:25 +01:00
wdammak
9f60c208ca
Update stats.class.php
Fix div/0 warnings
2019-01-18 22:25:51 +01:00
Laurent Destailleur
2db0f84f29 NEW Pagination into list of time spent 2019-01-18 20:06:33 +01:00
Laurent Destailleur
f82c917f13 Better use of email content to init project 2019-01-18 19:39:51 +01:00
Laurent Destailleur
e3d53867f4 WIP Billing task time 2019-01-18 18:11:10 +01:00
ptibogxiv
d6cfd15102
NEW add API REST for donations 2019-01-18 17:56:56 +01:00
Philippe GRAND
59cfa02bdb missing translation 2019-01-18 16:21:06 +01:00
Laurent Destailleur
971670da8d Clean language file 2019-01-18 14:24:49 +01:00
Laurent Destailleur
92eeff7a26 Fix packager and doc 2019-01-18 13:12:09 +01:00
Philippe GRAND
0290b74495 update with html5 compliant code 2019-01-18 10:18:18 +01:00
Philippe GRAND
44708ce7d5 update with html5 compliant code 2019-01-18 10:16:51 +01:00
Philippe GRAND
539660a45d update with html5 compliant code 2019-01-18 10:13:05 +01:00
Philippe GRAND
8096844062 update with html5 compliant code 2019-01-18 10:10:39 +01:00
Philippe GRAND
68c6ccae22 update with html5 compliant code 2019-01-18 10:06:45 +01:00
ptibogxiv
796b19bc1b
Update members.lang 2019-01-17 22:40:34 +01:00
ptibogxiv
9ae08d7897
FIX constant DONATION_USE_THIRDPARTIES in admin 2019-01-17 22:22:31 +01:00
ptibogxiv
a36cf5f2c7
Update 9.0.0-10.0.0.sql 2019-01-17 20:34:45 +01:00
Laurent Destailleur
5b037d87cb Update doc 2019-01-17 20:04:44 +01:00
ptibogxiv
4be8d8a945
FIX lang libelle in list.php 2019-01-17 20:01:28 +01:00
ptibogxiv
b05f6d82fa
Update subscription.class.php 2019-01-17 19:38:19 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
Laurent Destailleur
23baaa4626 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-17 19:27:36 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00