Commit Graph

25204 Commits

Author SHA1 Message Date
Laurent Destailleur
715490be0b Merge pull request #16929 from aspangaro/14a28
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Laurent Destailleur
a23a2a0119 Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
2021-03-29 17:39:58 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Laurent Destailleur
96363b3913 Merge pull request #16974 from ksar-ksar/develop
FIX #16940
2021-03-29 17:07:19 +02:00
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
e03fbda96a Avoid to obfuscate attributes with html tags inside 2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e FIX #yogosha5757 2021-03-29 14:43:40 +02:00
Laurent Destailleur
e382d49299 Fix bad permission 2021-03-29 13:49:24 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1 2021-03-29 12:10:35 +02:00
Laurent Destailleur
85f6a15678 Fix position of users in combo list 2021-03-29 11:58:51 +02:00
Laurent Destailleur
ad6f5e5a64 Fix permission export of services 2021-03-29 10:26:17 +02:00
daraelmin
8a43d65476 Copyright box_members_by_type.php 2021-03-29 07:49:15 +02:00
Laurent Destailleur
2a431d4951 Protect backtourl from using external urls 2021-03-28 21:39:18 +02:00
Laurent Destailleur
a5d84200dc Clean code for invoice list 2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
95a7e13e3a Debug establishment 2021-03-27 14:54:09 +01:00
Laurent Destailleur
5b64a517ea Fix label 2021-03-27 14:30:10 +01:00
Laurent Destailleur
1bb07c0eb1 Look and feel v14 2021-03-27 13:59:50 +01:00
stickler-ci
6a9d6a8634 Fixing style errors. 2021-03-27 12:44:34 +00:00
daraelmin
bad5aa6468 fix excluded member color in graph 2021-03-27 13:39:15 +01:00
Laurent Destailleur
1d48b883a7 Look and feel v14 2021-03-27 13:17:56 +01:00
daraelmin
c8a455edf4 add excluded memer on graph 2021-03-27 13:14:59 +01:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Alexandre SPANGARO
c1ceefb70f Update with new functionality 2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0 Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-27 04:12:15 +01:00
Florian HENRY
3e12820f0e fix comment 2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Laurent Destailleur
01c1101b29 Look and feel v14 2021-03-26 18:16:12 +01:00
lvessiller
05bf3cdab1 FIX stickler-ci errors 2021-03-26 17:59:16 +01:00
Laurent Destailleur
84ec032cc0 Look and feel v14 2021-03-26 17:58:00 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Laurent Destailleur
cfd992b930 Add call of rebuild_sequence with pgsql. 2021-03-26 13:10:06 +01:00
Laurent Destailleur
02ba8810cf Better error message 2021-03-26 12:23:42 +01:00
Laurent Destailleur
44cb9dca67 FIX must use getUrlContent to get external url in RSS module 2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
stickler-ci
c3d8df3ab2 Fixing style errors. 2021-03-25 13:53:41 +00:00
ksar
288d8d97cc FIX #16940
Update nblines after hook
2021-03-25 14:52:17 +01:00
ksar
ccd6d28f6f FIX #16843
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4

fa-mail-forward => fa-share
2021-03-25 14:39:42 +01:00
Laurent Destailleur
172b615d6c Debug auto numbering of lot/serial. 2021-03-25 11:51:29 +01:00
Laurent Destailleur
5ddd98cd39 Move module intracomm as experimental 2021-03-25 11:24:46 +01:00
Laurent Destailleur
ff52b1ee41 Merge pull request #16620 from altairisfr/pr_batch_masks
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
a4aa806e44 Merge pull request #16933 from daraelmin/daraelmin-patch-2
Fix #16794 V13 order by status instead of statut
2021-03-25 08:31:44 +01:00
Laurent Destailleur
5af02d96cd Show entity for user only if different than current entity 2021-03-25 03:58:54 +01:00
Laurent Destailleur
dce3b3e7af Rename page to avoid to have an index.html page 2021-03-25 03:47:45 +01:00
Laurent Destailleur
594c94feb2 Clean code. Allow iframes into the external frame module. 2021-03-25 03:44:38 +01:00