Commit graph

126990 commits

Author SHA1 Message Date
Laurent Destailleur
9e617abd43 Fix warning 2023-09-05 21:37:53 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
0e11cd1ee3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-05 19:39:00 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
HENRY Florian
ed1e8a825d
Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-05 19:17:11 +02:00
Florian HENRY
d0fb3839c3 reveiw 2023-09-05 19:15:43 +02:00
Florian HENRY
0b6297b5c5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-05 19:14:12 +02:00
Laurent Destailleur
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +02:00
Laurent Destailleur
28d9a01257
Merge pull request #25803 from atm-adrien/FIX_cant_access_to_facturefournrec_page
FIX : Can't access to rec supplier invoice card
2023-09-05 18:54:25 +02:00
Lamrani Abdel
d8c51cb311 check before each actions 2023-09-05 18:54:08 +02:00
Lamrani Abdel
b739b5b76d add badge for each tabs 2023-09-05 18:50:04 +02:00
Frédéric FRANCE
6b2a8ae744
phpstan 2023-09-05 18:27:30 +02:00
Laurent Destailleur
6e3f84c98d
Merge pull request #25802 from thomas-Ngr/14.0_fix_ticket_message_order
FIX : message order in ticket public view
2023-09-05 18:17:38 +02:00
Laurent Destailleur
fd63b47fd0
Merge pull request #25794 from hregis/fix_multicompany18_compatibility
FIX multicompany compatibility
2023-09-05 18:16:46 +02:00
Laurent Destailleur
68d67a7fed
Merge pull request #25791 from frederic34/patch-8
phpstan
2023-09-05 18:15:45 +02:00
Laurent Destailleur
408c73fbe1
Merge pull request #25790 from frederic34/patch-7
phpstan
2023-09-05 18:15:29 +02:00
Laurent Destailleur
5275adf4fa
Merge pull request #25795 from atm-sami/18.0_FIX_updateprice_massaction
FIX delete useless condition in massaction_pre
2023-09-05 18:15:09 +02:00
Laurent Destailleur
d0ace0f1b7
Merge pull request #25788 from frederic34/patch-6
phpstan
2023-09-05 18:14:17 +02:00
Laurent Destailleur
3b2ba9ccea
Merge pull request #25796 from FHenry/16_chore_better_comment_sql
fix: a comment in SQL in -- and space not --comment in one word
2023-09-05 18:03:16 +02:00
Laurent Destailleur
52a57aabac
Merge pull request #25797 from sonikf/patch-1
Fix translation
2023-09-05 18:02:39 +02:00
Laurent Destailleur
22cf5d096e
Merge pull request #25800 from frederic34/patch-9
fix tooltip ajax load langs
2023-09-05 18:02:20 +02:00
Laurent Destailleur
325eecdb7f
Merge pull request #25801 from Hystepik/bookcal_dev_2
New : Bookcal dev 2
2023-09-05 18:01:59 +02:00
Laurent Destailleur
e9cb81ded8 Code comment 2023-09-05 17:40:09 +02:00
Laurent Destailleur
c95c006810 Fix regression 2023-09-05 17:01:04 +02:00
atm-adrien
0c17b266d7 FIX : Can't access to rec supplier invoice card 2023-09-05 16:51:54 +02:00
Laurent Destailleur
6459c862b8 Comment 2023-09-05 16:50:23 +02:00
Laurent Destailleur
36c1c6be6a Fix test on entity for project 2023-09-05 16:33:37 +02:00
Hystepik
2701f8a2a8 New : Bookcal dev 2 2023-09-05 16:32:02 +02:00
Frédéric FRANCE
e922d07a97
fix tooltip ajax load langs 2023-09-05 16:19:21 +02:00
tnegre
ab7ab5c817 FIX : message order in ticket public view is not coherent with tickets events tab 2023-09-05 16:19:20 +02:00
Laurent Destailleur
82e7f829b0 NEW Support of js into the Dolibarr server preview 2023-09-05 15:55:44 +02:00
Lamrani Abdel
8f7d68ac8e add function for check comments for sections before any actions 2023-09-05 15:43:23 +02:00
Frédéric FRANCE
476e645e16
Merge branch 'develop' into develop-2 2023-09-05 15:35:13 +02:00
Laurent Destailleur
4be3933e5d Fix regression 2023-09-05 13:36:55 +02:00
sonikf
c340943f40
Fix translation 2023-09-05 13:55:44 +03:00
Florian HENRY
6e0824bf55 fix: a comment in SQL in -- and space not --comment in one word 2023-09-05 12:26:19 +02:00
ATM-Sami
c557baffc7 delete useless condition in massaction_pre 2023-09-05 10:31:51 +02:00
Regis Houssin
c437aecb1f FIX multicompany compatibility 2023-09-05 10:06:30 +02:00
Florian HENRY
7a45f083a5 fix travais 2023-09-05 09:22:18 +02:00
Laurent Destailleur
0ed6a63fb0 FIX #CVE-2023-4197 2023-09-05 00:49:01 +02:00
Laurent Destailleur
119f6b6a7f Fix missing deletion of an old file 2023-09-04 23:48:23 +02:00
Laurent Destailleur
924da777bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 23:26:35 +02:00
Laurent Destailleur
2cb6b158c1 Fix edit record in state dictionary 2023-09-04 23:20:25 +02:00
Laurent Destailleur
f403558a8f QUAL: Standardize code and look and feel for dictionaries 2023-09-04 22:49:55 +02:00
Laurent Destailleur
4f1f9ec455 NEW Add filter on status of line of a dictionary 2023-09-04 21:23:07 +02:00
Frédéric FRANCE
56bb72c1af
phpstan 2023-09-04 20:39:00 +02:00
Frédéric FRANCE
cd81c2e18d
phpstan 2023-09-04 20:29:33 +02:00
Laurent Destailleur
6e2962f22c Removed not expected line 2023-09-04 20:23:15 +02:00
Laurent Destailleur
3a84d84e65 Fix phpcs 2023-09-04 19:47:38 +02:00
Laurent Destailleur
76661fb18f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-04 19:46:28 +02:00