Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,044 Commits 36 Branches 190 Tags
223765aecff59bbff608f7aa7fb65a88e6484a6e
Commit Graph

9151 Commits

Author SHA1 Message Date
hystepik
4a0822ef2c Fix : fatal error in adherent/agenda.php 2022-11-26 12:21:50 +01:00
Laurent Destailleur
507be2b253 Fix syntax error 2022-11-26 12:20:07 +01:00
Laurent Destailleur
f71050ebca Fix support morecss on ajax_constonoff 2022-11-26 12:11:31 +01:00
antonin_tdj
cd94e42291 add parenthesis 2022-11-26 09:32:10 +01:00
antonin_tdj
5b53d1c5cf add cast to avoid sql injection (eldy asked) 
add cast to avoid sql injection (eldy asked)
 2022-11-26 09:30:40 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
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:43:09 +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
stickler-ci
ebae1c024f Fixing style errors. 2022-11-25 23:24:17 +00:00
antonin_tdj
9852d470ec Fix #20533 Dispatch Tab Quantity 
Fix #20533
Dispatch Tab Total Quantity now considers services (and the configuration option to manage stocks on services)
 2022-11-26 00:23:29 +01:00
Mathieu
c49e7e882f FIX#20415 2022-11-26 00:20:27 +01:00
Laurent Destailleur
eb2fada50f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 00:00:49 +01:00
Laurent Destailleur
c2cacdb8a5 Fix fatal error 2022-11-25 23:59:06 +01:00
Laurent Destailleur
f79778db40 Fix js null error 2022-11-25 23:47:17 +01:00
Laurent Destailleur
1ec862b491 Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
antonin_tdj
e7034f3c52 Merge branch 'Dolibarr:develop' into develop 2022-11-25 23:20:11 +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
amarchal
d3ccfeeadc hide private contact in thirdparty list 2022-11-25 22:12:41 +01:00
Laurent Destailleur
1c53d32ba0 Merge pull request #22969 from Hystepik/develop#4 
Fix : Yogosha#12007 add protection in dol_add_file_process
 2022-11-25 22:00:13 +01:00
hystepik
6dc3b13d6c fix error 2022-11-25 17:32:37 +01:00
hystepik
50d525ed70 Fix : Yogosha#12007 2022-11-25 17:20:39 +01:00
Laurent Destailleur
b04d4dd867 Merge pull request #22689 from bb2a/NEW---Compléte-function-pdfBuildThirdpartyName-to-use-company-name-of-contact 
NEW Make option PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME visible
 2022-11-25 16:49:35 +01:00
Laurent Destailleur
6475c9320d Merge pull request #22968 from Hystepik/develop#3 
fix : php 8.1 warnings
 2022-11-25 16:28:14 +01:00
hystepik
efc1697c62 fix : php8.1 warnings 2022-11-25 15:34:38 +01:00
Laurent Destailleur
0ccca81f12 Debug v17 - Finish move of type of event into actioncomm 2022-11-25 12:11:51 +01:00
Laurent Destailleur
03e8e49465 Fix responsive 2022-11-23 20:31:26 +01:00
Laurent Destailleur
4c02652d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 12:07:42 +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
8f196c1214 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-22 23:55:45 +01:00
Laurent Destailleur
18c0372fee Merge pull request #22894 from ksar-ksar/patch-18 
FIX #22893
 2022-11-22 21:55:01 +01:00
Laurent Destailleur
5c012a53f8 Update contact.lib.php 2022-11-22 21:54:21 +01:00
Laurent Destailleur
ba1f82b354 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:32 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
Artem Chernitsov
85e282b056 Merge branch 'Dolibarr:develop' into new-odt-abbility-to-supplier-invoices 2022-11-22 10:54:26 +02: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
282bddeac8 Merge pull request #22911 from FliyFly/scrutinizerFileLib 
Fix(scrutinizer) Typing error
 2022-11-21 21:03:09 +01:00
FLIO
44709f986c Fix(scrutinizer) https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/lib/files.lib.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0 2022-11-21 11:37:35 +01:00
Laurent Destailleur
8a70e0de72 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-21 04:03:20 +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
ksar
a1e546b8f9 FIX #22893 2022-11-17 22:01:32 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Artem Chernitsov
bbd9f0bc8d Merge branch 'develop' into new-odt-abbility-to-supplier-invoices 2022-11-14 18:44:54 +02:00
Artem Chernitsov
8ce49001a7 Add abbility of ODT support to supplier invoices 2022-11-14 18:10:31 +02:00
Laurent Destailleur
849a8fe3af Merge pull request #22803 from lamrani002/fix_issue_numToWord 
Fix issue scrutinizer htdocs/core/lib/functionsnumtoword.lib.php
 2022-11-14 11:25:12 +01:00