Commit Graph

9637 Commits

Author SHA1 Message Date
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
0c024ca96b Merge pull request #18297 from cfoellmann/hook-menu
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
9f293066ab Merge pull request #18206 from Hystepik/develop#2
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
5995e01bd1 Merge pull request #18280 from ptibogxiv/patch-439
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6 fix hook name 2021-07-30 15:19:05 +02:00
Christian Foellmann
0102e73306 add hook 'menu_LeftMenuArray' to filter the leftmenu items 2021-07-30 13:15:01 +02:00
ptibogxiv
da482018d2 Fix for php 8 2021-07-29 10:51:51 +02:00
Frédéric FRANCE
ae5d17815f Update dolreceiptprinter.class.php 2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947 Merge pull request #18245 from frederic34/patch-12
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
lmarcouiller
df8f099857 Fix a bug in ecm for v14 2021-07-28 15:57:12 +02:00
kamel
2cd7513936 NEW: add link to a element by ref 2021-07-28 12:18:35 +02:00
Lenin Rivas
6038ef6bba Add filter select company
Add filter with name alias and tva intra
2021-07-27 12:28:18 -05:00
Frédéric FRANCE
bc8be62809 Update dolreceiptprinter.class.php 2021-07-27 10:26:51 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +02:00
lmarcouiller
b309af0ab8 First push new scan quanty inventory 2021-07-19 13:43:48 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
ce27feda84 Debug v14
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
9aad07f20c Remove log 2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7 Fix css 2021-07-15 16:35:06 +02:00
Laurent Destailleur
21f295565a Merge pull request #18144 from Hystepik/develop#1
Fix : remove of a button which was forgotten
2021-07-14 13:50:42 +02:00
Laurent Destailleur
724d00fc6c Fix phpcs 2021-07-14 02:20:15 +02:00
lmarcouiller
9a12b5e424 Fix : remove of a button which was forgotten 2021-07-13 15:17:01 +02:00
evarisk-theo
f0599095ee Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-13 14:04:14 +02:00
Théo David
66f38d0012 fix: rename select_tickets_list into selectTicketsList 2021-07-13 14:00:16 +02:00
Laurent Destailleur
e755d68b06 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
bbce0f9c1b Update html.form.class.php 2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514 Merge pull request #18135 from Hystepik/develop#1
Fix #18110 : update of formticket.class.php
2021-07-13 11:48:36 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c Fixing style errors. 2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c Fix #18110 : update of formticket.class.php 2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4 fix: remove phpcs:enable tag 2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34 fix: rename select_tickets into selectTickets 2021-07-12 14:17:30 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
David
642d84a844 fix: code syntax 2021-07-12 09:26:18 +02:00
evarisk-theo
41b0735150 Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-12 09:10:15 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
64bd4ef784 Fix component to select ticket groups 2021-07-10 20:09:51 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Laurent Destailleur
12b1f5b23b Fix sql 2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
Laurent Destailleur
1209253d57 Sanitize data 2021-07-08 18:12:15 +02:00
Alexandre SPANGARO
eaa6987e8b Fix: formconfim if type radio must be :checked to get correct value 2021-07-08 17:15:03 +02:00
Laurent Destailleur
856d6eab4a Merge pull request #18102 from altairisfr/expe_extra
FIX display of extrafields on shipping lines
2021-07-08 16:35:38 +02:00
Laurent Destailleur
752b55ac98 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
2021-07-08 13:59:04 +02:00