2
0
forked from Wavyzz/dolibarr
Commit Graph

126919 Commits

Author SHA1 Message Date
Laurent Destailleur
f8e5bcdb62 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 15:12:21 +02:00
Laurent Destailleur
b65b8d7bcb FIX Navigation to/from a project from page of projects of a thirdparty 2023-09-06 15:08:54 +02:00
vmaury
d32f76b394 Order by salary lastname in hollidays month report (instead of fk_user) 2023-09-06 14:54:40 +02:00
Frédéric FRANCE
26dff90658 deprecate set_as_client 2023-09-06 14:38:35 +02:00
Quentin VIAL-GOUTEYRON
5001cc6de5 same fix for fec2 2023-09-06 14:23:16 +02:00
Hystepik
9e789eaa0b fix extrafields 2023-09-06 12:46:13 +02:00
Hystepik
11986275dd Fix add bookcal extrafields 2023-09-06 12:27:36 +02:00
Florian HENRY
cac1d7f617 new: all in repair.php force_collation_from_conf_on_tables 2023-09-06 11:09:46 +02:00
Florian HENRY
3af376444e fix: inner jion always better to use index than where 2023-09-06 10:32:59 +02:00
Regis Houssin
b6e84b1c74 FIX use urlencode for origin and originid 2023-09-06 10:02:12 +02:00
Frédéric FRANCE
9715d5fbc7 phpstan 2023-09-06 08:57:00 +02:00
Frédéric FRANCE
68ba7d2300 phpstan 2023-09-06 08:52:01 +02:00
Maxime Kohlhaas
7a51977cbd Fix missing 2023-09-06 08:47:31 +02:00
Florian HENRY
be4da9b22c Merge branch 'dev_sign_soeciete_rib' of github.com:FHenry/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:32:28 +02:00
Florian HENRY
37b43f97ce fix getDol 2023-09-06 08:32:13 +02:00
Florian HENRY
16f00adb8c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:22:00 +02:00
Regis Houssin
927cc91da4 FIX avoid wrong backtopage url 2023-09-06 06:44:10 +02:00
Regis Houssin
9b4f2f920a FIX avoid php8 warning 2023-09-06 06:27:12 +02:00
Laurent Destailleur
0d76c49244 Trans 2023-09-06 03:19:38 +02:00
Laurent Destailleur
84d12cf591 NEW Add option TAKEPOS_HIDE_PRODUCT_PRICES to hide prices in TakePOS 2023-09-06 02:38:57 +02:00
Laurent Destailleur
94950bee7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 01:42:48 +02:00
Laurent Destailleur
e2bf0315c3 Fix fatal error on mod_contrat_olive. Missing getExample() 2023-09-06 01:42:35 +02:00
Laurent Destailleur
c795d6df0b Merge pull request #25806 from frederic34/patch-6
phpstan
2023-09-05 23:40:16 +02:00
Laurent Destailleur
0e7703f0ce Merge pull request #25805 from lamrani002/checkBeforereWrite
NEW functionality for Checkin comments begin and end before each actions
2023-09-05 23:39:58 +02:00
Laurent Destailleur
e280bc0b11 Merge pull request #25804 from lamrani002/addBadgeInMB
NEW functionnality for add badge for each tabs
2023-09-05 23:37:58 +02:00
Laurent Destailleur
baa3863334 css 2023-09-05 22:41:17 +02:00
Laurent Destailleur
5f5e4738a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 22:38:39 +02:00
Laurent Destailleur
46919d1ac6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 21:39:15 +02:00
Laurent Destailleur
6d20175d08 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-05 21:38:43 +02:00
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