Philippe GRAND
|
ac3efe1d5b
|
Standardize and update code
|
2018-09-18 17:06:25 +02:00 |
|
Philippe GRAND
|
ad6ecc6231
|
Standardize and update code
|
2018-09-18 16:49:20 +02:00 |
|
Philippe GRAND
|
71d8356f6a
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018
|
2018-09-18 16:48:32 +02:00 |
|
Philippe GRAND
|
b4692f0812
|
fix merge
|
2018-09-18 16:45:06 +02:00 |
|
Philippe GRAND
|
4a15c7b158
|
fix merge
|
2018-09-18 16:42:13 +02:00 |
|
Philippe GRAND
|
c3bbe70e2d
|
fix merge
|
2018-09-18 16:38:14 +02:00 |
|
Laurent Destailleur
|
e2e3354807
|
Clean code
|
2018-09-18 16:35:38 +02:00 |
|
Laurent Destailleur
|
24279b71ef
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-18 15:29:01 +02:00 |
|
Laurent Destailleur
|
d98000c547
|
Merge branch 'develop' into new_branch_18_09_2018
|
2018-09-18 15:20:26 +02:00 |
|
Laurent Destailleur
|
34c130e715
|
Merge pull request #9551 from frederic34/patch-27
clean html donateur_code.php
|
2018-09-18 15:19:27 +02:00 |
|
Laurent Destailleur
|
2918d4dc9f
|
Merge pull request #9541 from frederic34/patch-23
reduce complexity of cronjob class
|
2018-09-18 15:18:28 +02:00 |
|
Laurent Destailleur
|
b67392b016
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-18 15:18:16 +02:00 |
|
Laurent Destailleur
|
52b6dd16da
|
Standardize code
|
2018-09-18 15:18:07 +02:00 |
|
Laurent Destailleur
|
eba0ce2f4f
|
Merge pull request #9540 from frederic34/patch-22
reduce complexity of contact class
|
2018-09-18 15:13:29 +02:00 |
|
Laurent Destailleur
|
b1d223069d
|
Merge pull request #9539 from frederic34/patch-21
reduce complexity of establishment class
|
2018-09-18 15:12:58 +02:00 |
|
Laurent Destailleur
|
03928a914d
|
Merge pull request #9537 from frederic34/patch-20
reduce complexity of actioncomm reminder class
|
2018-09-18 15:08:46 +02:00 |
|
Laurent Destailleur
|
2e7f853a8e
|
Merge pull request #9536 from frederic34/patch-19
reduce complexity of actioncomm class
|
2018-09-18 15:08:35 +02:00 |
|
Laurent Destailleur
|
6b8baab7b4
|
Merge pull request #9535 from frederic34/patch-18
reduce complexity of contrat class
|
2018-09-18 15:04:48 +02:00 |
|
Laurent Destailleur
|
61f5a2e899
|
Merge pull request #9533 from frederic34/trimParameters
trimParameters function
|
2018-09-18 15:04:32 +02:00 |
|
Laurent Destailleur
|
1c13fbb122
|
Merge pull request #9532 from frederic34/patch-17
reduce complexity of commoninvoice class
|
2018-09-18 15:03:25 +02:00 |
|
Laurent Destailleur
|
25d5200073
|
Merge pull request #9531 from frederic34/patch-16
reduce complexity of ProductStockEntrepot class
|
2018-09-18 15:03:04 +02:00 |
|
Laurent Destailleur
|
e65ec9f4ef
|
Merge pull request #9530 from frederic34/patch-15
reduce complexity of cchargesociales class
|
2018-09-18 15:02:44 +02:00 |
|
Laurent Destailleur
|
8c8c4bad21
|
Merge pull request #9529 from frederic34/patch-14
reduce complexity of user class
|
2018-09-18 15:02:24 +02:00 |
|
Laurent Destailleur
|
d72446cebc
|
Merge pull request #9528 from grandoc/new_branch_16_09_2018
New branch 16 09 2018
|
2018-09-18 15:01:23 +02:00 |
|
Laurent Destailleur
|
1a31071a5e
|
Merge pull request #9527 from frederic34/patch-11
clean datepicker
|
2018-09-18 15:00:52 +02:00 |
|
Laurent Destailleur
|
e6791e1763
|
Merge pull request #9526 from frederic34/patch-10
completely comment unused code
|
2018-09-18 14:59:55 +02:00 |
|
Laurent Destailleur
|
28f26f728a
|
Merge pull request #9553 from AXeL-dev/patch-1
Fix $heightforframes value to fit menu height on dolibarr 8
|
2018-09-18 14:59:34 +02:00 |
|
Laurent Destailleur
|
8c67e338eb
|
Merge pull request #9546 from frederic34/patch-26
clean stripe payment
|
2018-09-18 14:58:55 +02:00 |
|
Laurent Destailleur
|
dcc1c855fb
|
Merge pull request #9542 from frederic34/patch-24
reduce complexity of company lib
|
2018-09-18 14:58:17 +02:00 |
|
Laurent Destailleur
|
fa61ebeb9d
|
Merge pull request #9547 from grandoc/new_branch_17_09_2018
Standardize and update code
|
2018-09-18 14:57:50 +02:00 |
|
Laurent Destailleur
|
609c0c8b90
|
Merge pull request #9544 from ptibogxiv/patch-63
fix html
|
2018-09-18 14:57:26 +02:00 |
|
Laurent Destailleur
|
867850eadb
|
Merge pull request #9525 from frederic34/patch-9
reduce complexity societe class
|
2018-09-18 14:56:51 +02:00 |
|
Laurent Destailleur
|
1a1219ee2a
|
Trans
|
2018-09-18 14:52:50 +02:00 |
|
Laurent Destailleur
|
a8ecec68e7
|
css
|
2018-09-18 11:58:26 +02:00 |
|
Laurent Destailleur
|
e07ce644e8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
|
2018-09-18 11:49:35 +02:00 |
|
Philippe GRAND
|
ad061f4e13
|
Standardize and update code
|
2018-09-18 11:14:21 +02:00 |
|
Philippe GRAND
|
c08f443f0a
|
Standardize and update code
|
2018-09-18 11:09:56 +02:00 |
|
Philippe GRAND
|
72f906683f
|
Standardize and update code
|
2018-09-18 11:02:18 +02:00 |
|
Laurent Destailleur
|
2d8eb034e3
|
FIX Maxi debug to allow to load chart of account with multicompany
|
2018-09-17 21:02:07 +02:00 |
|
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 |
|