Commit graph

118373 commits

Author SHA1 Message Date
Maxime Kohlhaas
663ca3d284 Fix : don't display birthdays when 0 years 2023-07-24 12:25:21 +02:00
Laurent Destailleur
cb7dc2c5bf Prepare 17.0.3 2023-07-22 16:25:33 +02:00
Laurent Destailleur
1f5195c1a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-22 16:24:59 +02:00
Laurent Destailleur
18d0c72f0b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-22 14:15:28 +02:00
Laurent Destailleur
ce6b2d06db FIX #25223 2023-07-22 14:14:04 +02:00
Laurent Destailleur
3b6f8b5082 Fix phpcs 2023-07-21 17:09:00 +02:00
Laurent Destailleur
b704da5953 Merge branch '16.0' of github.com:Dolibarr/dolibarr into 17.0 2023-07-20 12:09:43 +02:00
Laurent Destailleur
908706e3d9 Fix phpcs 2023-07-20 12:09:13 +02:00
Laurent Destailleur
5c12f53249 Merge branch '16.0' of github.com:Dolibarr/dolibarr into 17.0 2023-07-20 11:31:55 +02:00
Laurent Destailleur
f169e10e8b Merge branch '15.0' of github.com:Dolibarr/dolibarr into 16.0 2023-07-20 11:31:22 +02:00
Laurent Destailleur
adf199e67c Fix php syntax error 2023-07-20 11:30:39 +02:00
Laurent Destailleur
5fa76ea981 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-20 01:09:02 +02:00
Laurent Destailleur
692439d320 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-20 01:08:13 +02:00
Laurent Destailleur
7cfba58722 Fix conflict 2023-07-20 01:07:37 +02:00
Laurent Destailleur
6d64026b93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-19 01:52:19 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/lib/agenda.lib.php
2023-07-19 01:50:18 +02:00
Laurent Destailleur
8fb316c5dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/card.php
2023-07-19 01:48:02 +02:00
Laurent Destailleur
63f112aea0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/product/card.php
	htdocs/projet/activity/perday.php
2023-07-19 01:46:22 +02:00
atm-gauthier
88a8bcdb22
FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40
FIX display project tasks list columns (#24557)
* fix: display columns

* fix fix

* fix: IDE
2023-07-16 12:02:14 +02:00
Laurent Destailleur
bcaad48cf2 FIX CVE XSS on company name reported by Belabed Skander from Akerva 2023-07-12 22:24:00 +02:00
Laurent Destailleur
9b5264a4fd FIX CVE reported by BELABED Skander (Akerva) 2023-07-12 21:45:42 +02:00
Alexandre SPANGARO
5ef0ebb543
FIX #24508 Label not reported when creating a supplier invoice template (#25340) 2023-07-12 17:07:22 +02:00
Laurent Destailleur
1998248e96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-12 16:36:23 +02:00
Regis Houssin
76d6a30d48
FIX to avoid wrong path of file (#25320) 2023-07-12 16:30:34 +02:00
lvessiller-opendsi
9044952f5c
FIX dol_print_error parameters on ticket fetch method (#25318) 2023-07-12 14:32:45 +02:00
atm-greg
45b393f027
Fix 17 mrp pdf vinci (#25324)
* fix htmlentities in desc + posy on multiline

* fix tes productToMake fetch and display info after that + remove useless product ReFetch
2023-07-12 14:25:30 +02:00
Laurent Destailleur
5fe1763043 Fix missing mandatory legal date 2023-07-12 02:52:10 +02:00
Laurent Destailleur
81f2b3f7ae FIX Missing localtaxes on receipt in TakePOS 2023-07-10 18:26:36 +02:00
Laurent Destailleur
0bc7664870 FIX Bad management of localtax on TakePOS due to typo error in var name 2023-07-10 05:45:45 +02:00
Laurent Destailleur
72a9478801 FIX Selection of customer on second or more parallel sell in TakePOS 2023-07-10 05:03:59 +02:00
Laurent Destailleur
41a3105678 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-10 03:23:02 +02:00
Laurent Destailleur
84ca2bcbcd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-10 03:22:12 +02:00
Laurent Destailleur
53ebd4b255 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-10 03:20:41 +02:00
Laurent Destailleur
b080c2699b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-07-10 03:18:49 +02:00
Laurent Destailleur
2182cb6f16 Fix css 2023-07-10 02:27:01 +02:00
Laurent Destailleur
773c7b2d83
Merge pull request #25298 from frederic34/patch-2
fix no supplier_proposal stats page
2023-07-09 13:35:19 +02:00
Laurent Destailleur
aae4598405 Fix phpcs 2023-07-09 12:55:44 +02:00
Frédéric FRANCE
754acf917f
fix no supplier_proposal stats page 2023-07-07 14:36:59 +02:00
Laurent Destailleur
f7ead5bee9
Merge pull request #25295 from jyhere/patch-1
FIX : extrafield quick edit not working on products
2023-07-07 13:41:29 +02:00
jyhere
862dbf7e23
FIX: quickedit code missing on product card 2023-07-07 11:42:54 +02:00
jyhere
91f19cfaa9
FIX : extrafield quick edit not working on products 2023-07-07 11:28:37 +02:00
Laurent Destailleur
899dce975b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-06 22:10:31 +02:00
Laurent Destailleur
b10e7b9d57 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-06 22:10:18 +02:00
Laurent Destailleur
9288084ae0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-06 22:08:04 +02:00
Laurent Destailleur
fbe7b8b71c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-07-06 22:06:37 +02:00
Laurent Destailleur
ebb1504fde Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-07-06 22:05:15 +02:00
Laurent Destailleur
a5fe2ab0e5
Merge pull request #25291 from atm-greg/Fix_13.0_bankentries_label_for_suppliers_payments
fix bankentries label for supplier payments
2023-07-06 22:03:40 +02:00
atm-greg
dccaf116a2 fix bankentries label for supplier payments 2023-07-06 12:03:16 +02:00
Laurent Destailleur
d02f05d3a3
Merge pull request #25272 from atm-greg/Fix_17.0_missing_rights_check_on_viewcat
add a check on service rights
2023-07-06 00:13:38 +02:00