2
0
forked from Wavyzz/dolibarr
Commit Graph

9859 Commits

Author SHA1 Message Date
Laurent Destailleur
97eacefa6b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-09-29 22:41:54 +02:00
Laurent Destailleur
f5fbbcfcb8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-09-29 22:40:45 +02:00
Laurent Destailleur
2c67c8b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-09-29 22:32:01 +02:00
Laurent Destailleur
d0fb08adf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-09-29 22:31:42 +02:00
Laurent Destailleur
624493fb26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-09-29 22:30:07 +02:00
Laurent Destailleur
6eddee9a78 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2024-09-29 22:29:19 +02:00
Laurent Destailleur
a27538f582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2024-09-29 22:27:42 +02:00
Laurent Destailleur
32646cb7f4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2024-09-29 19:25:49 +02:00
Florian Mortgat
74b67eb6c6 FIX - use price() to display qty on a product's stats tab to avoid showing too many decimals when rounding errors are possible (#31165) 2024-09-29 15:57:05 +02:00
Laurent Destailleur
4ea503f366 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-09-26 03:30:40 +02:00
Laurent Destailleur
65c9bd7dcf Merge remote-tracking branch 'origin/15.0' into 16.0 2024-09-26 03:25:38 +02:00
Laurent Destailleur
16a0d1d7d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-09-26 03:23:00 +02:00
thomas-Ngr
bb40a43c5f FIX Add same security test whe nuploading files from API than from GUI (#31114)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-26 03:13:34 +02:00
Benjamin Falière
dcba3347d8 Retroport: FIX determine multi-currency price on object line create tpl (#28021) (#30535)
* NEW determine multi-currency price on object line create tpl (#28021)

* Update html.form.class.php

---------

Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-18 03:22:38 +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
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
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
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
Laurent Destailleur
2ed6ae0799 Fix #29031 Fix #29059 2024-03-31 19:15:41 +02: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
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
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
0c86f64565 FIX permission on payment file of a tax 2024-03-04 14:03:46 +01:00
Laurent Destailleur
17ff0972ab Fix use of invoke into computed fields 2024-03-03 19:35:37 +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
Eric Seigne
e34e8ddb9a fix missing view.php 2024-02-27 01:09:30 +01:00
Eric Seigne
9d24025496 use TICKET_URL_PUBLIC_INTERFACE 2024-02-27 00:24:22 +01:00
Laurent Destailleur
9874d008aa Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-22 00:16:59 +01:00
Laurent Destailleur
88da45d9dd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-22 00:16:14 +01:00
Laurent Destailleur
a76eafa0d4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-22 00:15:35 +01:00
Laurent Destailleur
8c2a910a94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-22 00:13:59 +01:00
Saami PERDRIX
52646ee9f5 fix aperçu/dl fichier quand il est dans {userid}/temp (#27211) 2024-02-22 00:10:04 +01:00
Regis Houssin
832284e710 FIX avoid error "Column 'entity' in where clause is ambiguous" (#28270) 2024-02-19 15:20:08 +01:00
Laurent Destailleur
792606925f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2024-02-07 17:50:38 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Laurent Destailleur
b05d1c5f6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:03:28 +01:00
Laurent Destailleur
fcf024ef4f Merge pull request #27742 from FHenry/17_fix_online_link
fix: onligne Signaturelink is bad for locaorexternal
2024-01-23 17:13:44 +01:00
Florian HENRY
a5422d2fc4 fix: onligne Signaturelink is bad for locaorexternal 2024-01-23 11:37:44 +01:00
Florian HENRY
26bb72d12f FIX: filter by entity on contact is missing 2024-01-19 09:17:21 +01:00
Florian HENRY
d04cfa89ce FIX: filter by entity on contact is missing 2024-01-19 09:15:30 +01:00
Laurent Destailleur
d9858d9bb7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-18 16:00:26 +01:00
Laurent Destailleur
a2cdfa5492 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-18 15:59:40 +01:00