Commit Graph

23789 Commits

Author SHA1 Message Date
Laurent Destailleur
df9546662a Fix trans 2021-03-22 16:18:31 +01:00
Laurent Destailleur
897d653144 Debug default date for vat reports 2021-03-22 16:09:18 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Alexandre SPANGARO
17e0cc4bad Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da NEW: Add company info in dropdown login menu 2021-03-21 22:58:21 +01:00
Laurent Destailleur
4ac5d32c48 Fix picto 2021-03-21 22:27:12 +01:00
UT from dolibit
32cf5240f8
Create index.html 2021-03-21 22:17:50 +01:00
Laurent Destailleur
9d1dcccb86 Fix css 2021-03-21 22:15:37 +01:00
UT from dolibit
e6a2243627
Create index.html 2021-03-21 22:15:33 +01:00
UT from dolibit
6dc0d8202b
Create index.html 2021-03-21 22:14:13 +01:00
UT from dolibit
34b1b18a89
Create index.html 2021-03-21 22:12:19 +01:00
Laurent Destailleur
2a7b687fbf
Merge pull request #16918 from dolibit-ut/patch-151
Create index.html
2021-03-21 21:47:04 +01:00
Laurent Destailleur
4806d2f40b
Merge pull request #16916 from dolibit-ut/patch-149
Create index.html
2021-03-21 21:46:56 +01:00
Laurent Destailleur
ffb81d5acc
Merge pull request #16905 from dolibit-ut/patch-138
Create index.html
2021-03-21 21:46:49 +01:00
Laurent Destailleur
fa82f2161f
Merge pull request #16915 from dolibit-ut/patch-148
Create index.html
2021-03-21 21:46:43 +01:00
Laurent Destailleur
7f9199691a
Merge pull request #16908 from dolibit-ut/patch-141
Create index.html
2021-03-21 21:46:36 +01:00
Laurent Destailleur
4f025e419e
Merge pull request #16901 from dolibit-ut/patch-134
Create index.html
2021-03-21 21:46:29 +01:00
Laurent Destailleur
92b5d12574
Merge pull request #16903 from dolibit-ut/patch-136
Create index.html
2021-03-21 21:46:21 +01:00
Laurent Destailleur
2a25f3096c
Merge pull request #16902 from dolibit-ut/patch-135
Create index.html
2021-03-21 21:46:14 +01:00
Laurent Destailleur
449315c225
Merge pull request #16904 from dolibit-ut/patch-137
Create index.html
2021-03-21 21:46:07 +01:00
Laurent Destailleur
5ccbd62fc8
Merge pull request #16906 from dolibit-ut/patch-139
Create index.html
2021-03-21 21:45:59 +01:00
Laurent Destailleur
b798321f09
Merge pull request #16913 from dolibit-ut/patch-146
Create index.html
2021-03-21 21:45:53 +01:00
Laurent Destailleur
84487e4ef8
Merge pull request #16907 from dolibit-ut/patch-140
Create index.html
2021-03-21 21:45:46 +01:00
Laurent Destailleur
472fe901a7
Merge pull request #16909 from dolibit-ut/patch-142
Create index.html
2021-03-21 21:45:39 +01:00
Laurent Destailleur
ddea352092
Merge pull request #16910 from dolibit-ut/patch-143
Create index.html
2021-03-21 21:45:32 +01:00
Laurent Destailleur
d9ec217210
Merge pull request #16912 from dolibit-ut/patch-145
Create index.html
2021-03-21 21:45:25 +01:00
Laurent Destailleur
a78e62a16e
Merge pull request #16914 from dolibit-ut/patch-147
Create index.html
2021-03-21 21:45:18 +01:00
UT from dolibit
9eb50eee00
Create index.html 2021-03-21 21:40:37 +01:00
UT from dolibit
0241e2d449
Create index.html 2021-03-21 21:38:53 +01:00
UT from dolibit
98c2c59486
Create index.html 2021-03-21 21:36:41 +01:00
UT from dolibit
39190dc07f
Create index.html 2021-03-21 21:34:21 +01:00
UT from dolibit
5b028d192d
Create index.html 2021-03-21 21:33:39 +01:00
UT from dolibit
9925cdcbee
Create index.html 2021-03-21 21:32:35 +01:00
UT from dolibit
d0cace4f2c
Create index.html 2021-03-21 21:32:05 +01:00
UT from dolibit
50672bfe31
Create index.html 2021-03-21 21:19:54 +01:00
UT from dolibit
2a069a0a2c
Create index.html 2021-03-21 21:19:12 +01:00
UT from dolibit
4b3b4d072a
Create index.html 2021-03-21 21:17:12 +01:00
UT from dolibit
2f957667ed
Create index.html 2021-03-21 21:16:32 +01:00
UT from dolibit
163b960da9
Create index.html 2021-03-21 21:15:40 +01:00
UT from dolibit
8ec3c4a5b5
Create index.html 2021-03-21 21:14:52 +01:00
UT from dolibit
21a2b4e222
Create index.html 2021-03-21 21:13:33 +01:00
ptibogxiv
6d26b4aec3
Update notify.class.php 2021-03-21 21:11:39 +01:00
UT from dolibit
e4921fa843
Create index.html 2021-03-21 21:11:01 +01:00
UT from dolibit
c0e7800251
Create index.html 2021-03-21 21:10:13 +01:00
UT from dolibit
ae91f3be63
Create index.html 2021-03-21 21:07:25 +01:00
Laurent Destailleur
800eeef868 Clean code 2021-03-21 18:20:37 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
Laurent Destailleur
af199189b3 NEW Add color and picto for direction of movement 2021-03-21 13:46:01 +01:00
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +01:00
Laurent Destailleur
2b3599dba5 Clean code 2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0 Fix regression in tests 2021-03-20 20:51:19 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 19:51:26 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3
#Fix #16767 v13 unremovable attached file in mailmodel
2021-03-20 19:51:07 +01:00
Laurent Destailleur
e330c0f91a
Merge pull request #16883 from aspangaro/14a28
Uniformize information on modules
2021-03-20 19:49:33 +01:00
Laurent Destailleur
46aa01aea0 Fix permission on export of BOM and website 2021-03-20 19:15:15 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member 2021-03-20 19:09:49 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member 2021-03-20 19:06:15 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel
#Fix #16767 make default attached file of a mail model selected removable
2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 14:04:20 +01:00
Alexandre SPANGARO
3669c374c2 Uniformize information on modules 2021-03-20 13:55:43 +01:00
Laurent Destailleur
e1f23105a6 Finally try to follow install per entity instead of per instance. 2021-03-20 12:49:44 +01:00
Laurent Destailleur
65bf47b693
Merge pull request #16845 from hregis/fix_warning_php8
FIX avoid php8 warning with multicompany
2021-03-20 12:46:02 +01:00
stickler-ci
625f72303b Fixing style errors. 2021-03-20 11:43:13 +00:00
Laurent Destailleur
d8aa5f5eab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Regis Houssin
29e090b025 FIX force to entity 0 for all entities 2021-03-20 12:35:41 +01:00
Regis Houssin
573ca669da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8 2021-03-20 12:11:12 +01:00
Laurent Destailleur
ee84bef3b2
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
2021-03-20 11:52:19 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8
FIX avoid php8 warning in products list
2021-03-20 11:48:53 +01:00
Laurent Destailleur
285b166b12
Merge pull request #16849 from frederic34/ecmindex
fix php8 warnings
2021-03-20 11:37:00 +01:00
Laurent Destailleur
3cc8a8e2ee
Merge pull request #16850 from frederic34/patch-4
fix php8 warning
2021-03-20 11:28:47 +01:00
Laurent Destailleur
e54ca79a8c
Merge pull request #16854 from frederic34/confglobal
get conf global function
2021-03-20 11:26:32 +01:00
Laurent Destailleur
25f1b82c34
Merge pull request #16859 from frederic34/patch-11
fix doxygen
2021-03-20 11:24:50 +01:00
Laurent Destailleur
5f0a2e648b
Merge pull request #16871 from frederic34/patch-19
fix doxygen
2021-03-20 11:15:48 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22
fix doxygen
2021-03-20 11:15:32 +01:00
Laurent Destailleur
3ce4762710
Merge pull request #16873 from frederic34/patch-23
fix doxygen
2021-03-20 11:15:22 +01:00
Laurent Destailleur
bc639045c0
Merge pull request #16874 from frederic34/patch-24
fix doxygen
2021-03-20 11:15:12 +01:00
Laurent Destailleur
810b15f73a
Merge pull request #16875 from frederic34/patch-25
fix doxygen
2021-03-20 11:14:57 +01:00
Laurent Destailleur
1d2b3a0967
Merge pull request #16876 from frederic34/patch-26
fix doxygen
2021-03-20 11:12:46 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings 2021-03-20 10:50:02 +01:00
Frédéric FRANCE
65c3dced1c
fix doxygen 2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947
fix doxygen 2021-03-20 10:32:18 +01:00
Frédéric FRANCE
a8d8775328
fix doxygen 2021-03-20 10:30:26 +01:00
Frédéric FRANCE
dad7038a0d
fix doxygen 2021-03-20 10:22:34 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen 2021-03-20 10:21:23 +01:00
Frédéric FRANCE
8af1f278ae
fix doxygen 2021-03-20 10:19:03 +01:00
Laurent Destailleur
b5264e978b
Merge pull request #16776 from frederic34/boxticket
fix php8 warnings
2021-03-20 10:14:34 +01:00
Frédéric FRANCE
1a2b22def4
fix doxygen 2021-03-20 09:14:52 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function 2021-03-19 17:58:01 +01:00
Frédéric FRANCE
93ae7a3fed
fix php8 warning 2021-03-19 17:01:14 +01:00
Frédéric FRANCE
239dae03bf
fix php8 warnings 2021-03-19 16:57:12 +01:00
Laurent Destailleur
be90f5f2de Fix id of advanced perm 2021-03-19 15:00:22 +01:00
Laurent Destailleur
8462c4d3d3 Clean menu 2021-03-19 13:37:43 +01:00
Laurent Destailleur
aef2f1713e FIX #yogosha5673 2021-03-19 13:25:58 +01:00
Laurent Destailleur
ebf409f831 FIX #yogosha5668 2021-03-19 12:08:40 +01:00
stickler-ci
08727a86b0 Fixing style errors. 2021-03-19 10:53:06 +00:00