Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-16 09:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
124,383 Commits 40 Branches 191 Tags
e5c49cd006dcf0384bc44087ddcaeba554ca23a0
Commit Graph

110547 Commits

Author SHA1 Message Date
Laurent Destailleur
e5c49cd006 Merge pull request #25844 from frederic34/patch-9 
do not trunc label but only use css overflowmax
 2023-09-08 11:42:51 +02:00
Laurent Destailleur
e3688382ba Merge pull request #25821 from vmaury/fix_25820 
Order by salary lastname in hollidays month report (instead of fk_user)
 2023-09-08 11:26:33 +02:00
Frédéric FRANCE
01232b721d do not trunc label but only use css overflowmax 2023-09-08 11:25:54 +02:00
Laurent Destailleur
eef311dee7 Merge pull request #25823 from frederic34/loadlangs 
fix loadlangs
 2023-09-08 11:25:35 +02:00
Laurent Destailleur
d91ce60ab4 Merge pull request #25819 from frederic34/setascustomer 
deprecate set_as_client
 2023-09-08 11:23:06 +02:00
Laurent Destailleur
0914bc5c63 Merge pull request #25838 from mc2rcanarslan/fix_product_sql_error 
fix: missing space in generated product sql
 2023-09-08 10:57:15 +02:00
Frédéric FRANCE
198e7bf795 Merge remote-tracking branch 'upstream/develop' into loadlangs 2023-09-08 09:28:48 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
c2f8c4f47c Sec: param onlysimplestring is always 1 or 2 2023-09-08 02:29:20 +02:00
Laurent Destailleur
684c0b88b5 Sec: More robust call for dol_eval (with param '2') for computed fields 2023-09-08 01:57:47 +02:00
Laurent Destailleur
80c0c9c344 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 01:40:30 +02:00
Laurent Destailleur
9ed7bb77cd Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:36:26 +02:00
Can Arslan
d3f3147de3 fix: unknown column error on generated product sql 2023-09-07 12:53:50 -06:00
Laurent Destailleur
66a4433896 Fix regression 2023-09-07 17:39:54 +02:00
Laurent Destailleur
862f10f7fd Fix error management 2023-09-07 17:28:51 +02:00
Laurent Destailleur
b61998ec4b Log 2023-09-07 12:13:10 +02:00
Laurent Destailleur
0a853fe794 Removed files links.lang 2023-09-07 03:30:41 +02:00
Laurent Destailleur
05b067283a Removed useless file 2023-09-07 03:27:39 +02:00
Laurent Destailleur
94758009dd NEW Can see the favicon file into setup of properties of a website 2023-09-06 18:35:40 +02:00
Laurent Destailleur
20162a6d11 Fix support of xlink:href links in website module. 2023-09-06 17:11:30 +02:00
Frédéric FRANCE
e6f249eaca fix loadlangs 2023-09-06 17:00:19 +02:00
Frédéric FRANCE
9f53892fbe fix loadlangs 2023-09-06 16:57:50 +02:00
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
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
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
Laurent Destailleur
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +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
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
52a57aabac Merge pull request #25797 from sonikf/patch-1 
Fix translation
 2023-09-05 18:02:39 +02:00