Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
128,694 Commits 36 Branches 189 Tags
4b2cd22a2e70fe43a0692efcbda07b67390a8a7f
Commit Graph

10249 Commits

Author SHA1 Message Date
VIAL-GOUTEYRON Quentin
8b0cce4a13 FIX for country type (#29745) 
* FIX for country type

* fix precommit
 2024-05-23 12:55:39 +02:00
atm-jonathan
a26113bcb5 delete margin-top TCPDF <u> (#29737) 
* delete margin-top TCPDF <u>

* pre-commit
 2024-05-22 17:30:27 +02:00
Charlène Benke
79c2b9ea8e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-05-21 17:10:18 +02:00
Laurent Destailleur
a9b1f606d7 FIX ZAR currency must show the R before the amount 2024-05-10 11:15:21 +02:00
Laurent Destailleur
0cce9ac3c0 FIX extrafields on Organized events was broken 2024-05-09 13:19:06 +02:00
Laurent Destailleur
07fb11e08e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-05-02 13:24:33 +02:00
Laurent Destailleur
594280e1df Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-05-02 13:22:47 +02:00
Yannis Hoareau
37fcbc34b8 FIX: search and add extrafields to tasks when conf disabled (#29542) 
* FIX: task could be searched even if disabled

* FIX: could add extra fields to task even if disabled
 2024-05-01 17:37:12 +02:00
Laurent Destailleur
d9847070b3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-29 13:34:41 +02:00
Laurent Destailleur
94e93aea05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-29 13:32:47 +02:00
ksar
3df149045d FIX : Display the date according to user language on subsitutions (#29510) 
See : https://www.dolibarr.fr/forum/t/format-date-dune-variable-de-substitution-dans-un-modele-de-courriel/40705
 2024-04-28 01:17:09 +02:00
Laurent Destailleur
aac93f6e1f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-27 04:52:45 +02:00
Francis Appels
fdc1cdd94c FIX incorrect page numbering in PDF #29458 (#29476) 
* FIX incorrect page numbering in PDF #29458

* Work on width correction

* Work on width correction

* Work on width correction

* Work on code order
 2024-04-27 04:36:51 +02:00
Laurent Destailleur
50833e00d0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-27 03:14:17 +02:00
Laurent Destailleur
078c1dd489 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-27 03:13:12 +02:00
Laurent Destailleur
3a887ab2fa FIX #29496 - filtering a record should not hide its child not filtered 2024-04-27 03:12:17 +02:00
atm-irvine
0bcce7171b FIX : Row size of role contact in thirdparty (#29456) 2024-04-24 21:18:36 +02:00
John BOTELLA
cbed0292d1 FIX : Ergonomic fail part02 (#29373) 
* Fix ergo fail

* Fix read more

* Fix read more

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-22 14:32:07 +02:00
Laurent Destailleur
557c723c27 FIX logo and escape in RSS 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/core/lib/functions.lib.php
 2024-04-18 20:26:38 +02:00
John BOTELLA
94cc9c2e28 Fix ergo fail (#29370) 2024-04-17 16:56:39 +01:00
IC-Ilies
5cec87a80e FIX link type extrafield on warehouse not working (#29339) 2024-04-12 17:56:02 +02:00
boudet jean pascal
3076b6ad40 fix 500 error count array (#29337) 
* fix error 500  on array count

* fix pre-commit error

* Update html.form.class.php

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-12 14:44:54 +02:00
IC-Ilies
de1d67a6ae FIX #29333 supplier order extrafields of link type displays error (#29334) 2024-04-12 12:12:49 +02:00
Laurent Destailleur
16f4f4a661 FIX Button for disabled modules must not appear. 2024-04-04 17:26:45 +02:00
Laurent Destailleur
2ed6ae0799 Fix #29031 Fix #29059 2024-03-31 19:15:41 +02:00
Laurent Destailleur
49af1da76c Fix #29031 Fix #29059 2024-03-31 19:14:02 +02:00
Laurent Destailleur
dd5d70ad5d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
	htdocs/public/ticket/create_ticket.php
	htdocs/public/ticket/index.php
	htdocs/public/ticket/list.php
	htdocs/public/ticket/view.php
	htdocs/ticket/agenda.php
	htdocs/ticket/card.php
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/contact.php
	htdocs/ticket/document.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
	htdocs/ticket/messaging.php
	htdocs/ticket/stats/index.php
 2024-03-20 02:25:58 +01:00
Laurent Destailleur
a7223719a5 Merge pull request #28446 from rycks/18.0-ticket_code_review 
18.0 fix links error on dedicated virtualhost and ticket code review
 2024-03-20 01:55:57 +01:00
Laurent Destailleur
0584754c5c Fix badge 2024-03-19 22:18:23 +01:00
Laurent Destailleur
0476ca9a47 Doc 2024-03-19 17:00:59 +01:00
Laurent Destailleur
27db740058 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-17 21:53:32 +01:00
Laurent Destailleur
f7f64651c9 Fix bad merge 2024-03-17 21:52:45 +01:00
Laurent Destailleur
ac1ae64ef8 Merge branch '18.0' into 18.0-issue27029 2024-03-17 21:49:12 +01:00
Alfredo Altamirano
4ee4d1678f fix #28892 change default table ref on modulebuilder new dictionaries 2024-03-16 16:59:31 +00:00
Laurent Destailleur
453eb9c242 FIX: upload odt files should not start/end with space 2024-03-10 15:53:35 +01:00
Can Arslan
e74e638b26 FIX: skip adding tab if user doesn't have permission (#28698) 
verifCond function checks whether user has right and we should skip adding it if user doesn't have right
 2024-03-08 12:28:31 +01:00
Eric Seigne
57e5599d82 Merge branch '18.0' into 18.0-ticket_code_review 2024-03-08 00:12:22 +01:00
Laurent Destailleur
2d9801ffe3 Fix sec more complete list of forbidden function 2024-03-06 17:18:46 +01:00
Laurent Destailleur
f1aa29507a Fix sec more complete list of forbidden function 2024-03-06 15:01:25 +01:00
Laurent Destailleur
d7f3feba74 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-05 04:00:09 +01:00
Laurent Destailleur
0c86f64565 FIX permission on payment file of a tax 2024-03-04 14:03:46 +01:00
Laurent Destailleur
e82c6af5bc FIX permission on payment file of a tax 2024-03-04 14:03:17 +01:00
Laurent Destailleur
1e00cf34d4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-03 19:50:22 +01:00
Laurent Destailleur
17ff0972ab Fix use of invoke into computed fields 2024-03-03 19:35:37 +01:00
Laurent Destailleur
21feee3bc8 FIX Better test on validity of compute field syntax with parenthesis 2024-03-03 13:11:54 +01:00
Laurent Destailleur
47861abb48 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-01 19:05:46 +01:00
Laurent Destailleur
aaae1aad67 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-03-01 19:02:16 +01:00
Delthair
9ab1f56f83 Update expensereport.lib.php (#28553) 
ISSUE #28552
 2024-03-01 18:49:37 +01:00
Laurent Destailleur
24397000fe Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-01 18:16:31 +01:00
Laurent Destailleur
17015095aa Add option to allow better compatibility with computed fields using 
unsecured chars
 2024-03-01 18:15:58 +01:00