ldestailleur
089fab828b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2025-03-14 12:14:10 +01:00
Eric - CAP-REL
6f4b2a8905
allow spaces on natural search ( #33324 )
...
* allow spaces on natural search like documentation says
* clear comment
* sanitize backport from 19.0
* update sanitize call to be compatible with dolibarr 19.0 backported function
2025-03-11 02:13:06 +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
bd2285ab91
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-11-12 22:18:06 +01:00
lvessiller-opendsi
785c85205b
FIX substitute project variables in invoice documents ( #26445 )
...
* FIX substitute project variables in invoice documents
* Keep key to substitute if no link with project
2023-11-08 17:32:23 +01:00
Laurent Destailleur
1a2e49cebe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2023-11-05 19:45:42 +01:00
Laurent Destailleur
9c7381601f
Backport or better module compatibility
2023-11-05 19:35:34 +01:00
Andrés Maldonado
54a0245c4d
FIX: modification of complementary attributes in commercial proposals
...
The db object must not be cloned in order to avoid a PHP Fatal error: Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed
This commit replaces the dol_clone function by the one in the 17.0 branch
2023-10-04 17:48:30 +02:00
Laurent Destailleur
9923331ac1
Better backward compatibility of modules
2023-09-16 14:16:31 +02:00
Noé Courtier
6102139531
Fix: remove unwanted var_dump()
2023-06-09 15:43:19 +02:00
Laurent Destailleur
9a192e443e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-03-19 19:05:47 +01:00
Laurent Destailleur
249a6ea9a9
Remove warning
2023-03-19 14:49:54 +01:00
Laurent Destailleur
d3f679f2b1
Fix sql regression
2023-03-19 12:54:11 +01:00
Laurent Destailleur
502badad4b
Better error management
2023-03-19 11:32:46 +01:00
Laurent Destailleur
6e17c0c961
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-03-18 10:51:07 +01:00
Laurent Destailleur
b81cb7e963
Merge pull request #24070 from Daviid-P/ignore_localtaxes_if_localtax_type_zero
...
Ignore localtaxes if localtax1_type or localtax2_type is 0
2023-03-18 10:48:23 +01:00
Laurent Destailleur
91cf865583
Update functions.lib.php
2023-03-18 10:41:07 +01:00
David Pareja Rodriguez
927d0a2fa1
ORDER BY rowid
2023-03-13 11:16:37 +01:00
Laurent Destailleur
3300905599
Fix add a protection against bad param of dol_eval
2023-03-13 11:15:46 +01:00
Laurent Destailleur
ade0592a9b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-03-13 10:23:52 +01:00
noec764
353d451e5a
Correct dolForgeCriteriaCallback
2023-03-10 15:48:26 +01:00
David Pareja Rodriguez
590373a620
Forgot to loop on the results
2023-02-28 13:33:52 +01:00
David Pareja Rodriguez
b191330a79
Ignore localtaxes if localtax1_type or localtax2_type is 0
2023-02-28 13:24:11 +01:00
Laurent Destailleur
393f3a9480
Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage
...
FIX: fatal error on clicktodial backtopage
2023-02-09 15:40:28 +01:00
Laurent Destailleur
3dc8937ad3
Provide an object for computed extrafields
2023-02-07 00:11:33 +01:00
Théo David
394c3f847c
FIX clicktodial backtopage
2023-02-06 17:03:51 +01:00
Laurent Destailleur
2da8c1d9bc
Fix rounding
2023-01-10 11:33:17 +01:00
Laurent Destailleur
62b0447c7b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-12-14 10:20:47 +01:00
Alexandre SPANGARO
a107c81bf1
Merge branch '14.0' into 14p42
2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb
Fix css
2022-12-06 04:48:04 +01:00
Laurent Destailleur
9b5fc20308
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-12-01 17:46:13 +01:00
Eric Seigne
9a2ce53517
add stamp and signature in pictowithouttext list
2022-11-30 23:41:32 +01:00
Laurent Destailleur
b231bcb64a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbyaccount.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
85e9ac1e40
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-11-26 01:13:58 +01:00
Laurent Destailleur
1ec862b491
Merge pull request #22982 from inovea-conseil/fix_19877
...
FIX#19877
2022-11-25 23:41:18 +01:00
Mathieu
023bc7d20e
FIX#19877
2022-11-25 22:29:44 +01:00
Laurent Destailleur
207f56ff64
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-11-23 12:02:25 +01:00
Florian HENRY
85aa9f7481
FIX: base64_decode shloud be forbiden in dol_eval
2022-11-16 09:32:14 +01:00
Laurent Destailleur
ccaa23121e
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-10-15 13:57:23 +02:00
Laurent Destailleur
7387e535ef
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-10-15 13:51:50 +02:00
Ferran Marcet
1aa2427fd2
Fix: Not load project title when sending email from project
2022-10-10 11:26:20 +02:00
Laurent Destailleur
8fdf4876d9
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-10-06 15:39:10 +02:00
Laurent Destailleur
9125ac61a8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-10-06 15:33:59 +02:00
ksar
a72fff4a5d
FIX #22241
2022-10-05 16:39:26 +02:00