lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
116,247 Commits 43 Branches 150 Tags 886 MiB
4d8d83e6e2
Commit Graph

11396 Commits

Author SHA1 Message Date
Laurent Destailleur
95ca1f66c9 css 2022-11-02 02:42:14 +01:00
Laurent Destailleur
299dd2efd3
Merge pull request #22685 from frederic34/patch-5 
add ceil in evalmath
 2022-11-02 00:39:29 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
Laurent Destailleur
c436ef36b6
Merge pull request #22698 from Hystepik/develop#2 
Fix : php 8.1 warnings
 2022-11-01 22:05:39 +01:00
Laurent Destailleur
1e76422a50 NEW Show picto and color into combo for selection of tags 2022-10-31 13:00:41 +01:00
Laurent Destailleur
f0e51d4a28 Debug v17 - use of 'mode' for user list and filter on categories 2022-10-31 08:22:53 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
Laurent Destailleur
29d819be5e Rename cid so we can retreive it easily on file 2022-10-28 18:11:54 +02:00
Laurent Destailleur
18c9685051 Rename table to prepare need of direct debit for non invoices 2022-10-28 17:51:25 +02:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
lmarcouiller
bbebdbb840 Fix php 8.1 warnings 2022-10-28 15:48:46 +02:00
Laurent Destailleur
c9f43dc7a6 Fix error too large regex in memory 2022-10-28 04:20:54 +02:00
Laurent Destailleur
d1cd43c9d8 Fix same file content = same hash 2022-10-28 04:02:42 +02:00
Laurent Destailleur
f682edb4f2 Missing some info in log file 2022-10-28 03:37:01 +02:00
Frédéric FRANCE
2f60b5f847
add ceil in evalmath 2022-10-27 10:29:18 +02:00
Laurent Destailleur
bf794cacc0
Merge pull request #22615 from marc-dll/14.0_FIX_hidden_extrafields_update 
FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request
 2022-10-25 19:43:41 +02:00
Laurent Destailleur
7c892802eb Debug v17 2022-10-25 12:41:36 +02:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
5a9901e484 Clean code of module ticket 2022-10-24 20:28:36 +02:00
Laurent Destailleur
a01e628187
Merge branch 'develop' into feature/intervention_ext_download 2022-10-24 19:48:19 +02:00
Laurent Destailleur
91aaf8ef4e
Merge branch 'develop' into FIX---Max-size-send-backup 2022-10-24 19:16:16 +02:00
Laurent Destailleur
ba04a18d5d
Merge pull request #22648 from hregis/fix_remove_unused_code 
FIX remove unused code for avoid error
 2022-10-24 19:15:19 +02:00
Gauthier PC portable 024
d9f067eabb FIX : travis & stickler feedbacks 2022-10-24 09:46:41 +02:00
Laurent Destailleur
b4218f4c53 Responsive 2022-10-24 03:07:22 +02:00
Laurent Destailleur
26d1182838 FIX Debug ticket module (no double event when sending private message) 
FIX The backtopage after sending ticket message was ko.
 2022-10-23 22:32:52 +02:00
Laurent Destailleur
0f8d87da3b Clean code 2022-10-23 21:25:52 +02:00
Laurent Destailleur
9f0eaf58a9 Remove specialchar button 2022-10-23 17:56:54 +02:00
Laurent Destailleur
b6d0f9b997 NEW Can copy/paste images into emails sent. 2022-10-23 17:14:23 +02:00
Laurent Destailleur
a2d9dd3388 Clean code 2022-10-22 00:08:10 +02:00
Laurent Destailleur
d9c2528b62 Clean code 2022-10-21 23:49:45 +02:00
Laurent Destailleur
9a5a3a3517 Fix link to create event from user card 2022-10-21 16:21:09 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
3e5273d83b NEW Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone) 2022-10-21 11:14:28 +02:00
Regis Houssin
a96a623c0e FIX remove unused code for avoid error 2022-10-21 06:48:33 +02:00
Anthony Berton
1db5ab30a9 Link download file in mail 2022-10-21 00:34:52 +02:00
Anthony Berton
0e5f01dd13 Add param 2022-10-21 00:33:04 +02:00
Gauthier PC portable 024
02d9c9897a FIX : bug on selected value for select_bom() function 2022-10-20 16:27:20 +02:00
Gauthier PC portable 024
06646d4540 FIX : php doc 2022-10-20 15:56:32 +02:00
Gauthier PC portable 024
c3fb0fde85 FIX : we must be able to select only bom of a specific product + several fixes on select_bom() function 2022-10-20 15:53:03 +02:00
Laurent Destailleur
510125ceb0 Fix sanitize data 2022-10-20 15:47:44 +02:00
Laurent Destailleur
dc85e0df88 Fix #yogosha12949 2022-10-20 15:08:23 +02:00
Javier Núñez
eb4a260fca NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD 2022-10-20 13:52:51 +02:00
Laurent Destailleur
69ca6c02d7 Add debug for ldap 2022-10-20 12:16:12 +02:00
Laurent Destailleur
e3435bc301 Add debug for ldap 2022-10-20 12:14:11 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
b562ab9948 Fix debug module eventorganization 2022-10-18 23:33:11 +02:00
Laurent Destailleur
a6ff67a161 Fix debug module eventorganization 2022-10-18 23:12:15 +02:00
Laurent Destailleur
31ef942c96 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-18 23:09:52 +02:00
Laurent Destailleur
c727ebd9dd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-18 21:12:04 +02:00
Laurent Destailleur
da3ae71a47 Try to fix rounding error 2022-10-18 13:32:18 +02:00
Laurent Destailleur
46b5f80db9 Clean code 2022-10-18 13:30:51 +02:00
Marc de Lima Lucio
82ca472245 FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request 2022-10-18 10:50:21 +02:00
Laurent Destailleur
b07070d824
Merge pull request #22607 from OPEN-DSI/develop_new_multiselect_type_filter_on_tickets_list 
NEW: Change filter type on tickets list to multiselect
 2022-10-17 23:44:10 +02:00
Laurent Destailleur
159628be56 Fix the quick filter on MO 2022-10-17 15:54:48 +02:00
Laurent Destailleur
e1eb1c648f Tooltip on filename 2022-10-17 14:31:48 +02:00
Laurent Destailleur
304cb6d04c CSS preview picto visible even when filename is long 2022-10-17 13:58:34 +02:00
Laurent Destailleur
1e9f89ae5a FIX Missing reposition on edit button 2022-10-17 13:31:43 +02:00
kkhelifa
eb9ec07947 Correction Stickler CI 2022-10-17 10:47:19 +02:00
kkhelifa
4d92bef616 NEW: Change filter type on tickets list to multiselect 2022-10-17 10:40:34 +02:00
Laurent Destailleur
34166084de css 2022-10-16 20:33:00 +02:00
Laurent Destailleur
5bbbaab423 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-16 14:23:57 +02:00
Laurent Destailleur
388f55f056 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:31 +02:00
Laurent Destailleur
6ae8af440f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:04 +02:00
Laurent Destailleur
1ceb7dfb84
Merge pull request #22522 from ATM-Consulting/FIX_16.0_computed_extrafields_not_shown_if_no_other_extrafields 
FIX 16.0 - computed extrafields are not displayed if the object has no classic extrafields
 2022-10-15 10:40:17 +02:00
Frédéric FRANCE
01ad3d98b7 fix warning 2022-10-14 10:55:14 +02:00
Frédéric FRANCE
555f17f846 fix warning 2022-10-14 10:33:34 +02:00
Frédéric FRANCE
33ef00590f fix warning 2022-10-14 09:28:49 +02:00
Laurent Destailleur
03e1af0aa3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-13 18:33:24 +02:00
Laurent Destailleur
86af166792 css 2022-10-13 18:08:42 +02:00
Laurent Destailleur
d30d6dfe34 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-13 14:34:36 +02:00
Laurent Destailleur
409b137ba7 Try a better fix for #22535 #22536 2022-10-13 14:31:08 +02:00
Laurent Destailleur
8f5c05f577 Add price in local format in json response 2022-10-13 12:22:16 +02:00
Regis Houssin
a14a546906 FIX wrong var typo 2022-10-13 07:48:52 +02:00
Laurent Destailleur
eabf01a422 Debug sepa payment 2022-10-13 05:31:36 +02:00
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
f718de344b Fix typo 2022-10-12 19:40:21 +02:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
6eecb93f05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-11 17:01:59 +02:00
Laurent Destailleur
66c6d1927b Fix duplicate invoice created 2022-10-11 16:46:08 +02:00
Laurent Destailleur
f516a4b052 FIX filter on categories 2022-10-11 03:48:00 +02:00
Laurent Destailleur
532bfe3f92 Warning 2022-10-10 23:18:13 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
Laurent Destailleur
2053ad8f49 NEW Can switch status of website and page from the website toolbar 2022-10-09 20:52:50 +02:00
Laurent Destailleur
fa651f7566 Enhance website CMS toolbar 2022-10-09 17:49:44 +02:00
Laurent Destailleur
3efb1cccee NEW Picto for shared link is clicable 2022-10-08 03:05:19 +02:00
Laurent Destailleur
dbeb9d8f43
Merge pull request #22510 from grandoc/new_branch_06_10_2022b 
update code towards php8 compliance
 2022-10-07 23:51:34 +02:00
Laurent Destailleur
c5874416f9 FIX #22511 #22513 2022-10-07 23:39:10 +02:00
Laurent Destailleur
b051da4b04 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-07 22:50:58 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
4e4b0e0039 FIX Duplicate creation of invoice when closing shipment linked to order 2022-10-07 22:44:20 +02:00
atm-florian
40923c6af5 FIX 16.0 - computed extrafields are not displayed if the object has no "classic" extrafields 2022-10-07 13:13:59 +02:00
Laurent Destailleur
9677aa2db1 FIX List of contact assigned to project only if not disabled. 2022-10-06 18:18:07 +02:00
Laurent Destailleur
d436991c98 Removed useless plugin specialchar in CKeditor 2022-10-06 17:20:12 +02:00
Philippe GRAND
06d787713a update code towards php8 compliance 2022-10-06 16:43:57 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
63109d2844
Merge pull request #22182 from frederic34/pr/dolibit-ut/22136 
sample deprecated function
 2022-10-06 12:20:15 +02:00
Laurent Destailleur
1560228d9b
Merge pull request #22484 from Easya-Solutions/new-societe-set-thirdparty-type-with-trigger 
NEW set thirdparty type with company modify trigger
 2022-10-06 11:58:02 +02:00
lvessiller
9422a4bd1d FIX uses object fetch method in setValueFrom if method exists 2022-10-05 09:32:37 +02:00
Laurent Destailleur
29a01c1a59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-04 23:54:36 +02:00
Laurent Destailleur
959aef914e Clean code 2022-10-04 23:53:17 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
Laurent Destailleur
68c0188969 Revert "FIX: Preview button position on documents list (case when the file is too long)" 
This reverts commit 88b5594af3.
 2022-10-04 14:17:57 +02:00
Laurent Destailleur
eebb8290f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-02 13:52:48 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
Alexandre SPANGARO
51aa7e8027 Merge remote-tracking branch 'upstream/develop' into 17p6 2022-10-01 07:52:48 +02:00
Laurent Destailleur
625df49850 Clean and standardize code 2022-09-30 12:31:29 +02:00
Laurent Destailleur
150f4c45d8 FIX default value for partnership status 2022-09-29 15:20:19 +02:00
Laurent Destailleur
8180a8f0ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-28 21:20:48 +02:00
Laurent Destailleur
fb28d14097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-28 21:20:37 +02:00
Laurent Destailleur
ec29a6a608 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-28 21:18:22 +02:00
Laurent Destailleur
076dcd542b
Update html.formfile.class.php 2022-09-28 21:00:07 +02:00
Laurent Destailleur
98ed321514
Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Laurent Destailleur
8048322b65
Merge pull request #22435 from hregis/fix_csrf_and_lost_parameter_value 
FIX CSRF + lost value of constant after use save button
 2022-09-28 20:08:04 +02:00
thibdrev
ab2c1aa265
typo fix 
small typo fix in order to be consistent with how menus are described elsewhere in Dolibarr (like this: Menu 1 > Menu 1.1 > Menu 1.1.1).
 2022-09-27 18:49:39 +02:00
Regis Houssin
aafecb6d2b FIX missing the management of a constant in the Ticket config 2022-09-27 17:08:08 +02:00
Laurent Destailleur
d532ad1c8e Fix test ldap 2022-09-27 16:53:15 +02:00
Regis Houssin
d4ad93a94d TODO Add a visible option for captcha for ticket 2022-09-27 16:33:54 +02:00
Laurent Destailleur
5e6e6e1c98 NEW #22370 Modulebuilder supports 'alwayseditable' (like extrafields) 2022-09-27 01:50:56 +02:00
lmarcouiller
4b8583095f Merge branch '15.0' of github.com:Dolibarr/dolibarr into develop_v15#1 2022-09-26 10:41:40 +02:00
Alexandre SPANGARO
a415fcfe4c Use isModEnabled 2022-09-25 23:06:42 +02:00
Alexandre SPANGARO
e170da3fda Use isModEnabled 2022-09-25 23:00:12 +02:00
Alexandre SPANGARO
8c14377ecc Use isModEnabled 2022-09-25 22:52:16 +02:00
Alexandre SPANGARO
70e313f16e Use isModEnabled 2022-09-25 22:46:35 +02:00
Laurent Destailleur
277b81ce1b Fix loop 2022-09-25 22:08:06 +02:00
Alexandre SPANGARO
9772bbeff3 Use isModEnabled 2022-09-25 21:58:40 +02:00
Laurent Destailleur
8952530fad
Merge pull request #22184 from fboitel/fboitel-dev-scrutinizer-10/09/2022 
Fix scrutinizer 1
 2022-09-25 17:17:48 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Alexandre SPANGARO
e6e058a713 Use isModEnabled 2022-09-25 15:30:16 +02:00
Laurent Destailleur
877c57f6b8
Merge pull request #22281 from atm-lena/16.0_FIX_getunitFromCode_AddFilterType 
Function getUnitFromCode : add filter by type of unit
 2022-09-25 14:19:33 +02:00
Alexandre SPANGARO
b3d156728b Use isModEnabled 2022-09-25 06:22:58 +02:00
Alexandre SPANGARO
3bb28205a3 Use isModEnabled 2022-09-25 06:18:33 +02:00
Alexandre SPANGARO
5eaffd64e7 Use isModEnabled 2022-09-25 06:13:22 +02:00
Alexandre SPANGARO
49f1afccca Use isModEnabled 2022-09-25 06:09:29 +02:00
Alexandre SPANGARO
5fc79979bc Use isModEnabled 2022-09-25 06:02:13 +02:00
Philippe GRAND
2a5b91e3a2 update code toward php8 compliance 2022-09-24 14:43:29 +02:00
Philippe GRAND
fdd79cfa14 update code toward php8 compliance 2022-09-24 14:42:35 +02:00
Laurent Destailleur
8021c635cb
Merge pull request #22350 from frederic34/extrafieldpricewithcurrency 
NEW extrafield price with currency
 2022-09-23 17:44:09 +02:00
stickler-ci
b40627fc36 Fixing style errors. 2022-09-23 09:22:13 +00:00
UT from dolibit
f36b8b062b
Update html.formticket.class.php 2022-09-23 11:17:36 +02:00
Laurent Destailleur
c5c85fad9d Fix warning 2022-09-22 14:55:16 +02:00
Frédéric FRANCE
138ab46237 fix doc 2022-09-21 20:09:52 +02:00
Frédéric FRANCE
9ddf65de63 NEW extrafield price with currency 2022-09-21 14:59:46 +02:00
Laurent Destailleur
45c4a6ce1c Fix regression using confirm as POST (pb with cursor and download file) 2022-09-21 11:11:56 +02:00
Laurent Destailleur
cb7db080cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-21 01:21:11 +02:00