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 |
|
Florian HENRY
|
e93a362a0d
|
fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm
|
2021-07-23 18:33:18 +02:00 |
|
Frédéric FRANCE
|
44fa70c7c7
|
notify class indent
|
2021-07-22 09:24:14 +02:00 |
|
Frédéric FRANCE
|
5e6c942caf
|
notify class indent
|
2021-07-22 09:22:42 +02:00 |
|
Frédéric FRANCE
|
828e65c724
|
Update html.form.class.php
|
2021-07-20 20:56:01 +02:00 |
|
Frédéric FRANCE
|
71b95f3511
|
fix php8 warnings
|
2021-07-20 20:54:27 +02:00 |
|
ksar
|
4d6b63dbed
|
FIX #18181
FIX #18181
|
2021-07-20 16:14: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 |
|
BENKE Charlene
|
09954a3047
|
Update html.formcompany.class.php
|
2021-07-19 11:01:06 +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
|
a773652c04
|
Fix phpcs
|
2021-07-14 14:37:07 +02:00 |
|
Laurent Destailleur
|
7281a51eff
|
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio
fix showInputField checkbox and radio type
|
2021-07-14 13:55:53 +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 |
|
Alexis LAURIER
|
cd5e1d603e
|
fix showInputField checkbox and radio type
|
2021-07-14 12:02:03 +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 |
|
ATM john
|
7ad1738944
|
Fix setError
|
2021-07-11 15:58:34 +02:00 |
|
ATM john
|
19ab5ce420
|
Fix comments
|
2021-07-11 14:13:24 +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 |
|
Laurent Destailleur
|
16ee47b12c
|
Fix warning.
Reduce memory need for getmin/max on large graphs.
|
2021-07-08 11:13:15 +02:00 |
|
Laurent Destailleur
|
34c7295cbc
|
Make code more jquery compliant
|
2021-07-07 21:01:30 +02:00 |
|
Christophe Battarel
|
7e174412b7
|
FIX display of extrafields on shipping lines
|
2021-07-07 10:30:01 +02:00 |
|
Florian Mortgat
|
9f7be989c2
|
FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter()
|
2021-07-06 17:38:37 +02:00 |
|
Laurent Destailleur
|
5444d45e68
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-07-06 16:13:40 +02:00 |
|
Laurent Destailleur
|
e1a45df0d8
|
Fix phpunit
|
2021-07-06 16:12:11 +02:00 |
|
Laurent Destailleur
|
ced4ea1314
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
|
2021-07-06 15:59:59 +02:00 |
|
Laurent Destailleur
|
3c0e841877
|
Fix function not found
|
2021-07-06 15:55:43 +02:00 |
|
Laurent Destailleur
|
5779a56ae0
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-07-04 21:23:53 +02:00 |
|
Laurent Destailleur
|
f6efe51032
|
Fix trouble with product id = -1
|
2021-07-04 21:02:02 +02:00 |
|
Laurent Destailleur
|
0cccfb1cee
|
Fix phpcs v14
|
2021-07-04 19:23:04 +02:00 |
|
Laurent Destailleur
|
9b7c0a9246
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2021-07-03 18:32:31 +02:00 |
|
Laurent Destailleur
|
6ae1d192e4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
|
2021-07-02 16:14:12 +02:00 |
|
John BOTELLA
|
167ae5b0f2
|
Merge branch 'develop' into new_validation_method_for_common_object
|
2021-07-02 12:04:14 +02:00 |
|
Théo David
|
079608fe00
|
NEW #18046 Add ticket ticket categories functions
|
2021-07-02 10:26:03 +02:00 |
|
Frédéric FRANCE
|
3aa24cccff
|
fix can't remove extrafield date or datetime value
|
2021-07-01 15:15:35 +02:00 |
|
Laurent Destailleur
|
aec4d6016c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-06-30 17:27:40 +02:00 |
|
Laurent Destailleur
|
6cb5ea6ec2
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-06-30 17:27:20 +02:00 |
|
Laurent Destailleur
|
bda36337cd
|
Prepare fix #yogosha6443
|
2021-06-30 17:22:36 +02:00 |
|
Christophe Battarel
|
3b4ea5c5af
|
use formintervention
|
2021-06-30 10:56:09 +02:00 |
|
Christophe Battarel
|
27e2c62cab
|
Merge branch 'develop' into timespent2inter
|
2021-06-30 10:34:22 +02:00 |
|
Laurent Destailleur
|
02a5755876
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/langs/nl_NL/main.lang
|
2021-06-29 19:59:51 +02:00 |
|
Laurent Destailleur
|
c7befd9acc
|
Fix php8 (related to #18019)
|
2021-06-29 19:49:37 +02:00 |
|
Francis Appels
|
051bb3f3ef
|
Fix some core php8 warnings.
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
|
2021-06-29 16:37:07 +02:00 |
|
lmarcouiller
|
3d41c00199
|
New : selectGroupTicket multilevel >1 level
|
2021-06-29 16:13:03 +02:00 |
|
Christophe Battarel
|
c8f55907eb
|
stickler
|
2021-06-29 15:52:50 +02:00 |
|
Christophe Battarel
|
d423e47d3b
|
stickler
|
2021-06-29 15:50:41 +02:00 |
|
Christophe Battarel
|
ef8aaa7fd7
|
generate intervention from time spent
|
2021-06-29 15:26:04 +02:00 |
|
Francis Appels
|
9b59f264fd
|
Fix some php 8 warning
|
2021-06-28 20:00:10 +02:00 |
|
Laurent Destailleur
|
2fd47615eb
|
Fix load of conf when using alternative $db
|
2021-06-26 01:46:14 +02:00 |
|
Laurent Destailleur
|
6e3647af2c
|
Debug v14
|
2021-06-26 00:08:19 +02:00 |
|
Laurent Destailleur
|
4327d53c60
|
Fix closing linkto section when js on.
|
2021-06-23 14:38:24 +02:00 |
|
Laurent Destailleur
|
82ee5c2825
|
Clean code
|
2021-06-23 10:42:27 +02:00 |
|
Laurent Destailleur
|
40b35cc44a
|
Fix upload file form has disappear
|
2021-06-23 02:45:06 +02:00 |
|
Laurent Destailleur
|
cf28fcc8cd
|
CSS
|
2021-06-23 02:22:49 +02:00 |
|
Laurent Destailleur
|
62822c424c
|
Fix php8
|
2021-06-23 01:34:14 +02:00 |
|
Laurent Destailleur
|
12748640a5
|
Add log
|
2021-06-22 18:04:06 +02:00 |
|
Laurent Destailleur
|
bcffbe3d67
|
Test fix
|
2021-06-22 17:09:02 +02:00 |
|
ATM john
|
b8244edb89
|
Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object
|
2021-06-21 21:54:53 +02:00 |
|
ATM john
|
4d043b713c
|
WIP - create validation method for common object
|
2021-06-21 21:54:03 +02:00 |
|
Laurent Destailleur
|
6014e4407f
|
Clean code
|
2021-06-21 20:50:56 +02:00 |
|
Laurent Destailleur
|
a0b594fbdc
|
Debug emailcollector
|
2021-06-21 19:47:43 +02:00 |
|
Laurent Destailleur
|
31db1dc412
|
Fix management of visibility of export/import templates.
|
2021-06-21 15:03:45 +02:00 |
|
Frédéric FRANCE
|
4739694ad7
|
fix php warning
|
2021-06-20 16:24:58 +02:00 |
|
Laurent Destailleur
|
a9dd5e8764
|
Fix css hidoneprint
|
2021-06-20 12:52:04 +02:00 |
|
Laurent Destailleur
|
e3e2dfd764
|
Fix generation of ODT (test if temporary directory is writable)
|
2021-06-20 05:11:46 +02:00 |
|
Laurent Destailleur
|
1a6647e690
|
Debug v14
|
2021-06-20 04:10:25 +02:00 |
|
Laurent Destailleur
|
8df9815049
|
Add warning to help understand bug of post_max_size.
|
2021-06-20 01:04:16 +02:00 |
|
Laurent Destailleur
|
4a3da84098
|
Clean code
|
2021-06-19 23:52:52 +02:00 |
|
Laurent Destailleur
|
414b5e612f
|
Better info on upload size limit
|
2021-06-19 22:11:16 +02:00 |
|
Laurent Destailleur
|
61bd572a9c
|
Fix token for ajax call
|
2021-06-17 03:37:52 +02:00 |
|
Laurent Destailleur
|
3754c2c3c9
|
Fix name of field
|
2021-06-17 00:59:11 +02:00 |
|
Laurent Destailleur
|
f850f058fa
|
Look and feel v14
|
2021-06-16 21:06:55 +02:00 |
|
Laurent Destailleur
|
b2221d2c3a
|
Update extrafields.class.php
|
2021-06-16 14:31:22 +02:00 |
|
Antonin MARCHAL
|
d5cb81982d
|
fix wrong display on extrafields type = double
|
2021-06-16 14:21:23 +02:00 |
|
Laurent Destailleur
|
1c87420895
|
Fix #yogosha6411
|
2021-06-15 20:22:36 +02:00 |
|
Laurent Destailleur
|
3a5770f679
|
Clean code
|
2021-06-15 20:16:05 +02:00 |
|
Laurent Destailleur
|
3b9936f7e2
|
Fix responsive
|
2021-06-15 01:18:17 +02:00 |
|
stickler-ci
|
82f195dc30
|
Fixing style errors.
|
2021-06-14 19:15:53 +00:00 |
|
ATM john
|
be367c589f
|
WIP - create validation method for common object
|
2021-06-14 21:12:48 +02:00 |
|
ATM john
|
23765bf459
|
WIP - create validation method for common object
|
2021-06-14 20:59:46 +02:00 |
|
Laurent Destailleur
|
5cc86d2319
|
Fix #yogosha6370
|
2021-06-14 13:51:09 +02:00 |
|
Laurent Destailleur
|
046215f64a
|
Fix PHP8
|
2021-06-14 02:08:28 +02:00 |
|
Laurent Destailleur
|
f8f951977c
|
Debug v14
|
2021-06-14 01:33:01 +02:00 |
|
Laurent Destailleur
|
abfc87c1de
|
Fix separator extrafields must not appear as selected fields
|
2021-06-13 13:32:41 +02:00 |
|
ATM john
|
43ecba2e63
|
WIP - create validation method for common object
|
2021-06-12 14:16:40 +02:00 |
|
ATM john
|
578dc9adde
|
WIP - create validation method for common object
|
2021-06-12 12:58:20 +02:00 |
|
Laurent Destailleur
|
756786f717
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
|
2021-06-11 19:05:05 +02:00 |
|
Laurent Destailleur
|
0b4385b554
|
Merge pull request #17885 from frederic34/patch-13
fix warnings
|
2021-06-11 18:00:48 +02:00 |
|
Laurent Destailleur
|
0bbe2210f2
|
FIX #17649
|
2021-06-11 17:58:52 +02:00 |
|
Laurent Destailleur
|
73a1119b26
|
Clean code
|
2021-06-11 15:21:24 +02:00 |
|
Laurent Destailleur
|
1605564d5e
|
Clean code
|
2021-06-11 14:54:18 +02:00 |
|
Frédéric FRANCE
|
f58cf14ae9
|
Update html.formmail.class.php
|
2021-06-10 22:28:19 +02:00 |
|
Frédéric FRANCE
|
86f39795c0
|
fix warnings
|
2021-06-10 22:26:58 +02:00 |
|
Frédéric FRANCE
|
759472f5d1
|
fix warning
|
2021-06-10 20:58:56 +02:00 |
|
Laurent Destailleur
|
1bf63c7862
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
|
2021-06-10 16:53:09 +02:00 |
|
Laurent Destailleur
|
24f8b6386e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2021-06-10 16:47:45 +02:00 |
|
Laurent Destailleur
|
92b20d3595
|
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
FIX : childtablesoncascade doc
|
2021-06-10 12:59:19 +02:00 |
|
Laurent Destailleur
|
8a46fd376f
|
Update commonobject.class.php
|
2021-06-10 12:58:42 +02:00 |
|
Laurent Destailleur
|
067f37e22e
|
Clean code
|
2021-06-10 00:09:38 +02:00 |
|
Laurent Destailleur
|
2681d58107
|
FIx CVE ID: CVE-2021-33816
|
2021-06-09 16:41:31 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Dorian Vabre
|
0a23cf029d
|
using strlen instead of count
|
2021-06-09 14:13:50 +02:00 |
|
Laurent Destailleur
|
d6cbb9007f
|
Debug ticket form to add a local file
|
2021-06-07 01:43:24 +02:00 |
|
ATM john
|
801f6cab2d
|
WIP - create validation method for common object
|
2021-06-06 21:58:59 +02:00 |
|
ATM john
|
f1b1dcd1b1
|
WIP - create validation method for common object
|
2021-06-06 21:53:17 +02:00 |
|
ATM john
|
aa94d40ad0
|
WIP - create validation method for common object
|
2021-06-06 21:12:03 +02:00 |
|
ATM john
|
1aca7efce3
|
Fix childtablesoncascade doc
|
2021-06-06 13:15:03 +02:00 |
|
Laurent Destailleur
|
fb0d2cdddc
|
Debug v14
|
2021-06-05 15:27:49 +02:00 |
|
Laurent Destailleur
|
b6ba1de3b3
|
Fix remove use of captcha on backoffice for ticket creation
|
2021-06-05 02:18:45 +02:00 |
|
Laurent Destailleur
|
702de427bd
|
Merge pull request #17758 from frederic34/patch-20
fix warnings
|
2021-06-04 11:52:53 +02:00 |
|
Laurent Destailleur
|
c67ea954f7
|
Merge pull request #17752 from frederic34/patch-14
fix warnings
|
2021-06-04 11:51:01 +02:00 |
|
Laurent Destailleur
|
b31b210324
|
Merge pull request #17773 from Hystepik/develop#4
New : add of a new param in selectGroupTicket
|
2021-06-04 10:37:18 +02:00 |
|
Frédéric FRANCE
|
ca66cdad01
|
debug intracomm report transport mode
|
2021-06-03 21:47:10 +02:00 |
|
ATM john
|
a7300d01b0
|
WIP - create validation method for common object
|
2021-06-03 09:49:07 +02:00 |
|
lmarcouiller
|
ab64f467f5
|
add of a new param in selectGroupTicket
|
2021-05-31 09:31:38 +02:00 |
|
Frédéric FRANCE
|
ca0654323f
|
fix warnings
|
2021-05-27 23:11:05 +02:00 |
|
Frédéric FRANCE
|
52d44bd75e
|
fix warnings
|
2021-05-27 22:28:59 +02:00 |
|
Laurent Destailleur
|
8b1b2019f8
|
Update html.form.class.php
|
2021-05-26 17:24:27 +02:00 |
|
Laurent Destailleur
|
c3c0ad1c8d
|
Update html.form.class.php
|
2021-05-26 17:20:09 +02:00 |
|