Commit Graph

8541 Commits

Author SHA1 Message Date
Francis Appels
cef9a8e8d4 Fix Price by qty for multiprices 2022-12-31 13:42:18 +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
Laurent Destailleur
28e56de8fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-07 12:38:10 +01:00
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
Laurent Destailleur
ac8914eb19 FIX #23115 FIX #23116 2022-12-06 19:25:56 +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
Frédéric FRANCE
9f4182c924
fetch entity contact to take the right directory 2022-12-02 11:00:52 +01:00
Laurent Destailleur
8236ad34fa Fix revert a new feature that must be in develop 2022-12-01 18:34:20 +01:00
Laurent Destailleur
e8e9086c15
Merge pull request #22999 from inovea-conseil/FIX#20415
FIX#20415
2022-12-01 17:52:55 +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
Mathieu
99a34e23c8 FIX#20415 2022-11-26 00:33:23 +01:00
Mathieu
c49e7e882f FIX#20415 2022-11-26 00:20:27 +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
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
Laurent Destailleur
9a0b10bf9f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:34 +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
VESSILLER
ed2a9a22e8 FIX compute next value when year is on one digit for reset counter 2022-11-23 08:36:20 +01:00
Laurent Destailleur
d6b77b2404
Merge pull request #22904 from daraelmin/patch-4
Fix #22675 - avoid warning when weight is empty
2022-11-21 21:15:50 +01:00
Laurent Destailleur
7c1eac9774 Fix sqli ->escape after ->escapeforlike 2022-11-21 03:58:22 +01:00
daraelmin
4912f6a720
Fix #22675 - avoid warning when weight is empty 2022-11-19 22:15:58 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Gauthier PC portable 024
af6a708523 FIX : Missing $object for online signature link build 2022-11-08 14:20:09 +01:00
Laurent Destailleur
257e7f2191 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:41:04 +02:00
Laurent Destailleur
e9b80fa656 Fix phpcs 2022-10-24 19:40:51 +02:00
Laurent Destailleur
010177942e
Merge pull request #22641 from hregis/fix_avoid_unnecessary_multiple_calculation
FIX avoid unnecessary multiple calculation (#22637)
2022-10-24 19:29:49 +02:00
Laurent Destailleur
937840dbfe
Merge pull request #22655 from hregis/fix_avoid_access_forbidden_with_numeric_ref
FIX avoid access forbidden with numeric ref
2022-10-24 17:21:57 +02:00
Yoan Mollard
7ff84f4e42 Add help picto to remind users to respect SPF/DKIM in FROM e-mails 2022-10-23 03:25:55 +02:00
Regis Houssin
2bf2faef72 FIX avoid access forbidden with numeric ref 2022-10-22 09:22:12 +02:00
Regis Houssin
765e619cee FIX avoid unnecessary multiple calculation (#22637) 2022-10-20 14:47:55 +02: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
Laurent Destailleur
409b137ba7 Try a better fix for #22535 #22536 2022-10-13 14:31:08 +02:00
Laurent Destailleur
020d3dcbe5 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 12:14:04 +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
1a71ce23dd Fix lang load 2022-10-08 02:54:10 +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
2df791ccf7 Fix badge not visible on delivery tab 2022-10-07 21:22:17 +02:00
Laurent Destailleur
ca6bed109e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:22 +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
Laurent Destailleur
81e5c428a1
Update invoice.lib.php 2022-10-06 11:52:40 +02:00
ksar
a72fff4a5d
FIX #22241 2022-10-05 16:39:26 +02:00
Regis Houssin
af34a968fc FIX missing check if incoice as a payment (wrong status) 2022-10-05 10:31:32 +02:00