Commit Graph

30129 Commits

Author SHA1 Message Date
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
Laurent Destailleur
7d0fd0d815 Merge pull request #22881 from lamrani002/fix_issue_22846
Fix issue #22846
2022-11-22 21:59:29 +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
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +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
Laurent Destailleur
a90d509d06 NEW: Show delivery mode on PDF for proposals 2022-11-22 13:02:01 +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
Laurent Destailleur
6aefc9edfc Enable MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA by default 2022-11-21 18:30:17 +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
Anthony Berton
a9b14b7b2d Copy 2022-11-21 09:29:30 +01:00
Anthony Berton
cb20ac6567 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-21 08:26:24 +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
Anthony Berton
420ccd3c6b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-18 17:08:05 +01:00
Anthony Berton
4ea20e6511 Clean code 2022-11-18 17:06:11 +01:00
Anthony Berton
d25cc6e832 Clean 2022-11-18 16:28:21 +01:00
Anthony Berton
b272877fe2 Sponge and FIx and optimise 2022-11-18 16:20:52 +01:00
Laurent Destailleur
2dffe3748d Debug v17 - Fix missing delete picto on ODT setup 2022-11-18 13:41:27 +01:00
Anthony Berton
9d74ce7ed2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-18 10:41:53 +01:00
Laurent Destailleur
af2df0e500 css 2022-11-18 00:58:23 +01:00
ksar
a1e546b8f9 FIX #22893 2022-11-17 22:01:32 +01:00
Frédéric FRANCE
bbf844939c fix MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2022-11-17 16:00:13 +01:00
Laurent Destailleur
96df6759a7 Merge pull request #22794 from lamrani002/fix_issue_vat_number
fix issue for variable does not seem to exist
2022-11-17 12:43:54 +01:00
Lamrani Abdel
482775cd38 Fix issue #22846 2022-11-17 10:55:46 +01:00
Laurent Destailleur
ed9b828af8 Merge pull request #22860 from ns-info90/develop
FIX#22859
2022-11-17 10:36:16 +01:00
Laurent Destailleur
e972ee7bb3 Merge pull request #22868 from frederic34/receiptprinter
add new tags in receipt printer
2022-11-17 10:23:45 +01:00
Anthony Berton
72d20a963a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-16 21:08:44 +01:00
Nicolas SILOBRE
b9457b099d Merge branch 'Dolibarr:develop' into develop 2022-11-16 20:43:12 +01:00
Laurent Destailleur
db454a6374 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-16 20:35:53 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
VESSILLER
fb5c3ee02e FIX stickler ci 2022-11-16 18:09:18 +01:00
VESSILLER
53df25a966 NEW presend mass action in contact list 2022-11-16 15:58:00 +01:00
Artem Chernitsov
532627db15 Merge branch 'Dolibarr:develop' into new-odt-abbility-to-supplier-invoices 2022-11-16 15:22:45 +02:00
Frédéric FRANCE
2d50b73072 add new tags in receipt printer 2022-11-16 14:18:51 +01:00
Frédéric FRANCE
5a887f11bb add new tags in receipt printer 2022-11-16 14:12:09 +01:00
Laurent Destailleur
1e3e26e7f9 Fix use of the lowmemorydump for batch of backup 2022-11-16 14:00:52 +01:00
Nicolas SILOBRE
a733e08f84 Merge branch 'Dolibarr:develop' into develop 2022-11-16 13:22:52 +01:00
Laurent Destailleur
2dc6fe9785 Merge pull request #22865 from FliyFly/bugErrorCode
Fix(Scrutinizer) add public
2022-11-16 11:22:19 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Laurent Destailleur
4d771ef726 Fix position of tables in sql request for better performance 2022-11-15 21:54:19 +01:00
admin_nsinfo
344319e8e8 #22859 2022-11-15 21:02:21 +01:00
Laurent Destailleur
2f3cc7ce59 FIX Backup using the low memory mode 2022-11-15 19:02:56 +01:00
Laurent Destailleur
1c15984698 Merge pull request #22855 from Hystepik/develop#3
fix : php 8.1 warnings
2022-11-15 17:29:24 +01:00
FLIO
73db58a700 Fix(Scrutinizer) add public 2022-11-15 17:10:04 +01:00