Commit Graph

112489 Commits

Author SHA1 Message Date
Laurent Destailleur
5e49ed17d3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-16 09:36:44 +01:00
Laurent Destailleur
6add56a425 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-16 09:35:23 +01:00
Laurent Destailleur
5c0179d5ed Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-03-16 09:32:50 +01:00
Laurent Destailleur
5af17195b7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-03-16 09:31:50 +01:00
Laurent Destailleur
a52ae607ba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2023-03-16 09:30:36 +01:00
Laurent Destailleur
6aa8ba8935 Removed unexpected files 2023-03-16 09:29:10 +01:00
Laurent Destailleur
0a8ebb7dc4 Removed unexpected files 2023-03-16 09:27:45 +01:00
Laurent Destailleur
f9b9c7eefe Removed unexpected files 2023-03-16 09:27:12 +01:00
Laurent Destailleur
38b82a14b6 Removed unexpected files 2023-03-16 09:26:38 +01:00
Laurent Destailleur
dade946160 Removed unexpected files 2023-03-16 09:26:03 +01:00
Laurent Destailleur
a6dae99f56 More robust various payment when data are corrupted 2023-03-13 19:45:42 +01:00
Laurent Destailleur
01698aba6b Clean corrupted data (bank lines with no bank account) 2023-03-13 19:28:51 +01:00
Laurent Destailleur
11950a31a2 Fix link to bank on various payment when data corrupted (bank deleted) 2023-03-13 19:12:44 +01:00
Laurent Destailleur
3300905599 Fix add a protection against bad param of dol_eval 2023-03-13 11:15:46 +01:00
Laurent Destailleur
abfd324301 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:24:01 +01:00
Laurent Destailleur
ade0592a9b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:23:52 +01:00
Laurent Destailleur
f6f70461ee Merge pull request #23802 from glu000/16.0-issue-23799
Fix #23799 External users are not able to create events
2023-03-12 17:48:54 +01:00
Laurent Destailleur
f6b8cd0208 Merge branch '16.0' into 16.0-issue-23799 2023-03-12 17:47:02 +01:00
Laurent Destailleur
cb40103d49 Merge pull request #23926 from rycks/16.0_fix_log_of_cmailfile_class_moved_after_bcc_defined
move log after variable updates to get good informations in logs
2023-03-12 17:15:17 +01:00
Laurent Destailleur
1cf3cc4813 Merge pull request #24144 from frederic34/patch-8
Fix translation
2023-03-10 19:14:17 +01:00
Laurent Destailleur
0c7d7b56cf Merge pull request #24181 from noec764/patch-2
Correct dolForgeCriteriaCallback
2023-03-10 18:08:48 +01:00
noec764
353d451e5a Correct dolForgeCriteriaCallback 2023-03-10 15:48:26 +01:00
Laurent Destailleur
0028ca6fb6 Merge pull request #24177 from ATM-Consulting/FIX_16.0_expensereport_add_ndf
Fix expensereport add ndf
2023-03-10 14:46:17 +01:00
Laurent Destailleur
4722191f3b Merge pull request #24171 from mapiolca/patch-48
FIX  Extrafields in Notes to unify with orders or invoices.
2023-03-10 14:45:45 +01:00
Laurent Destailleur
fc4dbc06fa Merge pull request #24170 from frederic34/patch-13
typo in fr_FR
2023-03-10 14:45:14 +01:00
Laurent Destailleur
da338edb51 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-10 13:03:22 +01:00
Laurent Destailleur
7a59c0ef4b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-10 13:03:11 +01:00
Laurent Destailleur
6c224f3dac Merge pull request #24043 from ymollard/fix-morphy-new.php
Fix member nature display in new.php
2023-03-10 11:39:20 +01:00
GregM
7996ecf4f8 Fix expensereport add ndf 2023-03-10 10:42:00 +01:00
stickler-ci
e0aa056845 Fixing style errors. 2023-03-09 14:40:43 +00:00
Pierre Ardoin
04f463259f Add Extrafields in Notes
Add support of extrafields in notes if its specified in extrafield's settings.
2023-03-09 15:26:59 +01:00
Frédéric FRANCE
9147f0cba1 typo in fr_FR 2023-03-09 14:10:43 +01:00
Frédéric FRANCE
2863481629 Update list.php 2023-03-07 10:26:21 +01:00
Frédéric FRANCE
b197607fb7 Fix translation 2023-03-07 10:25:27 +01:00
Yoan Mollard
ebac8ef1f1 Fix double morphy display when morphy is forced 2023-03-05 17:06:32 +01:00
Yoan Mollard
7a7d1c2fb1 Revert "Fix member nature display in new.php"
This reverts commit fd371cc52b.
2023-03-05 16:58:45 +01:00
Yoan Mollard
d9c47b93df Revert "Drop the double <tr>"
This reverts commit a02e88dc28.
2023-03-05 16:55:45 +01:00
Laurent Destailleur
65acdd358a Merge pull request #24093 from marc-dll/16.0_FIX_accountancy_lettering
FIX: accountancy: lettering error management and prevention
2023-03-04 17:48:59 +01:00
Laurent Destailleur
f2e467e0d3 Merge pull request #24121 from FHenry/16_fix_auto_account
fix: input percent deposit is missing on auto-deposit feature
2023-03-04 15:18:29 +01:00
Laurent Destailleur
5e34b85f6a Merge pull request #24115 from noec764/16_FIX_invoiceAvoirWithPaymentRestAmount_addLine
FIX: Resolve error message due to missing arguments
2023-03-04 15:13:38 +01:00
Florian HENRY
3b0b731eee fix: mathod call with default value 2023-03-04 13:50:14 +01:00
Noé Courtier
2bc158a2bb FIX: Resolve error message due to missing arguments 2023-03-03 16:08:17 +01:00
Laurent Destailleur
89810f97c1 Merge pull request #23941 from ATM-Consulting/FIX_propalestats_SQL_unknown_column_fk_soc
FIX: SQL error "unknown column p.fk_soc"
2023-03-03 13:41:32 +01:00
Laurent Destailleur
51a890bf1a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:30:02 +01:00
Laurent Destailleur
59f2644d46 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:29:35 +01:00
Laurent Destailleur
eaaee09d42 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-03 12:11:35 +01:00
Laurent Destailleur
abc8004896 Merge pull request #24108 from inovea-conseil/FIX_taskinevent
FIX select for task in event card
2023-03-03 12:02:20 +01:00
Nicolas
50d4f2d90f FIX select for task in event card 2023-03-03 12:00:24 +01:00
Laurent Destailleur
215cd58827 Fix for #24094 2023-03-03 11:53:21 +01:00
Laurent Destailleur
9328aa4cfc Merge pull request #24104 from ATM-Consulting/FIX_16.0_propalestats
FIX 16.0 propalestats Unknown column 'p.fk_soc' in 'on clause'
2023-03-03 11:47:18 +01:00