Commit Graph

70431 Commits

Author SHA1 Message Date
AXeL-dev
361f1c3d9a fix $heightforframes value to fit menu height on dolibarr 8 2018-09-17 16:39:58 +01:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Laurent Destailleur
1e36aba35f Trans
Conflicts:
	htdocs/langs/en_US/admin.lang
2018-09-17 16:42:44 +02:00
Laurent Destailleur
2f06e58237 css 2018-09-17 16:31:58 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Philippe GRAND
cc5a8eb7d9 Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 15:03:27 +02:00
Laurent Destailleur
98f26bfcfb NEW Can set 2 url in url field of thirdparty 2018-09-17 14:31:30 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Laurent Destailleur
d717e28338 Trans 2018-09-17 14:15:30 +02:00
Frédéric FRANCE
20e245108f
clean html donateur_code.php 2018-09-17 13:12:04 +02:00
Laurent Destailleur
d872beb499 Fix css 2018-09-17 12:59:43 +02:00
Philippe GRAND
cd796bf682 Standardize and update code 2018-09-17 12:29:21 +02:00
Philippe GRAND
2a0ed0f14c Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 12:27:36 +02:00
Laurent Destailleur
a75629e8e9 CSS 2018-09-17 12:25:49 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Philippe GRAND
484b36c5aa Standardize and update code 2018-09-17 09:31:32 +02:00
Philippe GRAND
01ea6aee6c Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 09:25:42 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Philippe GRAND
a1b15f170e Standardize and update code 2018-09-17 09:00:23 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
ptibogxiv
0770d8e56e
Update transaction.php 2018-09-16 23:14:22 +02:00
ptibogxiv
3c5a9326e1
Update transaction.php 2018-09-16 23:13:24 +02:00
Frédéric FRANCE
9cf6c6aeb4
clean stripe payment 2018-09-16 23:02:37 +02:00
ptibogxiv
38b23d2be4
Update charge.php 2018-09-16 22:55:50 +02:00
ptibogxiv
35f2f5f48c
Update transaction.php 2018-09-16 22:41:17 +02:00
ptibogxiv
7f4378870c
Fix link display 2018-09-16 22:39:38 +02:00
ptibogxiv
8c32ffd2e2
fix html 2018-09-16 22:36:58 +02:00
Laurent Destailleur
7fb2b1a769 Fix reset extrafields that must be unique when cloning 2018-09-16 22:30:13 +02:00
Laurent Destailleur
9415486059 Unique extrafields are reset when cloning contract 2018-09-16 22:13:29 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib 2018-09-16 21:40:28 +02:00
Frédéric FRANCE
0e0197f246
reduce complexity of cronjob class 2018-09-16 19:26:49 +02:00
Frédéric FRANCE
a4fd8c4b75
reduce complexity of contact class 2018-09-16 19:19:45 +02:00
Frédéric FRANCE
ad2d15bef1
reduce complexity of establishment class 2018-09-16 19:11:56 +02:00
Frédéric FRANCE
beb7a0609c
reduce complexity of actioncomm reminder class 2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class 2018-09-16 19:04:43 +02:00
Frédéric FRANCE
122275f2a7
reduce complexity of contrat class 2018-09-16 18:58:59 +02:00
Frédéric FRANCE
f935701d30
trimParameters 2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618
trimParameters 2018-09-16 15:16:08 +02:00
Laurent Destailleur
eeb919dcda Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 14:24:13 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php 2018-09-16 14:07:11 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class 2018-09-16 13:59:15 +02:00
Frédéric FRANCE
367e202df0
reduce complexity of cchargesociales class 2018-09-16 13:54:17 +02:00
Frédéric FRANCE
4120d0f92c
reduce complexity of user class 2018-09-16 13:49:22 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Laurent Destailleur
9c4f582f5c Merge 2018-09-16 12:52:11 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00