Commit Graph

99909 Commits

Author SHA1 Message Date
Laurent Destailleur
da757a8b75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-27 18:06:51 +02:00
Laurent Destailleur
e0cd351b3e Fix sanitize website module 2023-03-27 17:37:09 +02:00
Gauthier PC portable 024
723cdcea19 FIX : Add bookmark with search fields that are arrays (backport 4157263cb8) 2023-03-27 12:24:33 +02:00
Laurent Destailleur
520280479c
Merge pull request #24197 from glu000/16.0-issue-23966-2
FIX  #[23799] - External users are not able to create events - correction
2023-03-27 08:30:41 +02:00
Laurent Destailleur
a633766b23 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-24 19:42:19 +01:00
Laurent Destailleur
6b07447b81 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-24 19:42:06 +01:00
Laurent Destailleur
a07d40c530 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-24 19:40:51 +01:00
Laurent Destailleur
459d012c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-24 19:40:36 +01:00
Laurent Destailleur
8e97adf456 Removed useless files 2023-03-24 19:39:59 +01:00
Regis Houssin
b9aeadf566 FIX avoid phpunit error 2023-03-24 17:30:00 +01:00
Regis Houssin
4240ac18f3 FIX task have the same entity of project 2023-03-24 16:18:14 +01:00
Regis Houssin
7a12ba9c20 FIX missing "multidir_output" for project sharing (Multicompany) 2023-03-24 16:07:34 +01:00
Gilles Lengy
885b767a1f FIX|Fix #24298 No error or 0.00 instead of NULL in database anymore when emptying an extrafield of type price on a propal card 2023-03-22 20:26:19 +01:00
Thibault Fiacre
45b7a911d8
FIX invoices order on sells journal
On sells journal, invoices are ordered by date (datef) but when several invoices have the same date, sometimes they are not ordered by reference.
2023-03-22 08:14:58 +01:00
VESSILLER
738c507724 no need escape js 2023-03-21 17:53:29 +01:00
VESSILLER
b23d3a0edd fix stickler-ci 2023-03-21 17:42:19 +01:00
VESSILLER
fe4b993871 FIX change date on select date input when prefix is used 2023-03-21 17:05:46 +01:00
Frédéric FRANCE
033d375cd8
Fix ordering by u.fk_user 2023-03-21 12:02:05 +01:00
Laurent Destailleur
14fd90dbad Fix sign in llx_bank of amount_main_currency 2023-03-20 14:20:35 +01:00
VESSILLER
8dd7a22482 FIX limit after order in get objects in category 2023-03-20 09:45:02 +01:00
Laurent Destailleur
9a192e443e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-19 19:05:47 +01:00
Laurent Destailleur
88353ee5ba Fix tests 2023-03-19 17:38:22 +01:00
Laurent Destailleur
249a6ea9a9 Remove warning 2023-03-19 14:49:54 +01:00
Laurent Destailleur
d3f679f2b1 Fix sql regression 2023-03-19 12:54:11 +01:00
Laurent Destailleur
c895f366a1 Fix sql 2023-03-19 11:36:06 +01:00
Laurent Destailleur
502badad4b Better error management 2023-03-19 11:32:46 +01:00
Laurent Destailleur
6e17c0c961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-18 10:51:07 +01:00
Laurent Destailleur
b81cb7e963
Merge pull request #24070 from Daviid-P/ignore_localtaxes_if_localtax_type_zero
Ignore localtaxes if localtax1_type or localtax2_type is 0
2023-03-18 10:48:23 +01:00
Laurent Destailleur
91cf865583
Update functions.lib.php 2023-03-18 10:41:07 +01:00
Laurent Destailleur
9e0c822512 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-18 10:30:11 +01:00
Laurent Destailleur
4ef435e286 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-18 10:24:52 +01:00
Laurent Destailleur
05de5d7e9f
Merge pull request #24206 from noec764/14_AddContextFor_selectForFormsListWhere_hook
FIX: Add more context for selectForFormsListWhere Hook
2023-03-18 02:35:57 +01:00
Laurent Destailleur
926c99f913
Update html.form.class.php 2023-03-18 02:35:31 +01:00
Laurent Destailleur
0d090e90d5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-18 01:37:03 +01:00
Laurent Destailleur
c90016b8e5 Prepare 16.0.5 2023-03-18 01:36:51 +01:00
Laurent Destailleur
66643a0dc6 Fix phpcs 2023-03-18 00:33:51 +01:00
Laurent Destailleur
d8f3d8afef
Merge pull request #24247 from noec764/FIX_Add_Hook_on_ticket_libStatut
FIX: Add missing hook on LibStatut
2023-03-17 23:13:20 +01:00
Noé Courtier
e618eb3e64 FIX: Add missing hook on LibStatut 2023-03-17 10:58:41 +01:00
Regis Houssin
bb7b69ef43 FIX FILTER_VALIDATE_EMAIL param is not a string 2023-03-17 06:43:15 +01:00
VESSILLER
84afd61eba FIX missing protection on ajax public ticket page for valid email 2023-03-16 11:21:56 +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
Noé Courtier
645b0c563e FIX: Add more context for selectForFormsListWhere Hook 2023-03-14 11:43:36 +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
David Pareja Rodriguez
927d0a2fa1 ORDER BY rowid 2023-03-13 11:16:37 +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
Guenter Lukas
914096bd0a update 2023-03-13 08:45:29 +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
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
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
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
GregM
87fa075ce0 Fix 16.0 propalestats 2023-03-03 10:20:45 +01:00
Laurent Destailleur
0c9a95e8a6
Merge pull request #24089 from marc-dll/16.0_FIX_expensereport_ik
FIX: expense reports: JS error when selecting mileage fees expense type if MAIN_USE_EXPENSE_IK disabled
2023-03-02 16:24:56 +01:00
Marc de Lima Lucio
d3edbbb51b FIX: accountancy lettering: correctly calculated number of lettering operations done 2023-03-02 15:56:20 +01:00
Marc de Lima Lucio
49afabd440 FIX: accountancy lettering: prevent null results when fetching link with payments 2023-03-02 15:16:04 +01:00
Marc de Lima Lucio
1c57b75510 FIX: accountancy lettering: better error management 2023-03-02 15:04:15 +01:00
Marc de Lima Lucio
b84e20d09f FIX: whitespaces 2023-03-02 14:52:56 +01:00
Laurent Destailleur
a107682dbc
Merge pull request #24075 from hregis/fix_right_access_problem
FIX missing "authorid" for getNomUrl link right access
2023-03-02 13:39:25 +01:00
Laurent Destailleur
7994825086
Update list.php 2023-03-02 13:39:08 +01:00
Marc de Lima Lucio
0ddb4eb9b2 FIX: expense reports: error when selecting mileage fees expense type if MAIN_USE_EXPENSE_IK disabled 2023-03-02 11:51:06 +01:00
Laurent Destailleur
597e6c0a7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-02 10:49:47 +01:00
Regis Houssin
4877c80c36 FIX missing "authorid" for getNomUrl link right access 2023-02-28 16:44:32 +01:00
David Pareja Rodriguez
590373a620 Forgot to loop on the results 2023-02-28 13:33:52 +01:00
David Pareja Rodriguez
b191330a79 Ignore localtaxes if localtax1_type or localtax2_type is 0 2023-02-28 13:24:11 +01:00
Yoan Mollard
a02e88dc28 Drop the double <tr>
Must be displayed both in the if and else
2023-02-26 22:18:30 +01:00
Yoan Mollard
fd371cc52b Fix member nature display in new.php 2023-02-24 23:31:06 +01:00
Christophe Battarel
3c58b1cfc7 add comment for Travis to play it again sam 2023-02-24 16:28:15 +01:00
Christophe Battarel
f140036f37 FIX shipping list for external user 2023-02-24 15:59:43 +01:00
Laurent Destailleur
7ec32d2458 Fix phpunit 2023-02-23 21:28:58 +01:00
atm-florian
b29ebef05f Propale stats: reworking of the fix to comply with travis rule for SQL string building 2023-02-23 18:03:00 +01:00
stickler-ci
af4228064d Fixing style errors. 2023-02-23 07:33:16 +00:00
pratushraj
d326e59beb issue #24014 2023-02-23 13:00:31 +05:30
Laurent Destailleur
5cd7173140 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-22 14:34:33 +01:00
Laurent Destailleur
da503e6c58 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-22 14:33:59 +01:00
Laurent Destailleur
7c2258acd7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-22 14:32:45 +01:00
Laurent Destailleur
56bc4b0538 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-22 14:32:35 +01:00
Laurent Destailleur
e7546e6da1 FIX #23804 2023-02-22 14:29:36 +01:00
Laurent Destailleur
f1a7b5b0b4
Update dict.php 2023-02-22 13:53:46 +01:00
Quentin VIAL-GOUTEYRON
08bcd4af31 FIX : mandatory date for service didnt work for invoice 2023-02-22 12:19:36 +01:00
Regis Houssin
1555e0242b FIX label dictionary is used by barcode and member module 2023-02-22 10:28:30 +01:00
Laurent Destailleur
be82f51f68 Fix regression 2023-02-21 20:50:26 +01:00
Laurent Destailleur
0703645304 Fix missing protection on ajax public ticket page 2023-02-21 20:47:35 +01:00
Laurent Destailleur
70c99b1f79 Fix pdf 2023-02-21 18:32:36 +01:00
Laurent Destailleur
1f3aa24c8a Fix missing date delivery on invoice 2023-02-21 16:56:16 +01:00
Laurent Destailleur
dd6e2821bc Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-21 12:17:41 +01:00
Laurent Destailleur
2a9079bd10 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-21 12:17:30 +01:00
Rémi Champlon
baa28e175d indent 2023-02-20 16:47:01 +01:00
Rémi Champlon
aa60bd29c1 check link empty in switch 2023-02-20 16:39:03 +01:00
Quentin VIAL-GOUTEYRON
a57ad3b96b Merge branch 'FIX_accounting_filter_pgc_version' of github.com:atm-quentin/dolibarr into FIX_accounting_filter_pgc_version 2023-02-20 14:08:50 +01:00
Guenter Lukas
9d43d51888 FIX: #23966 Error "Param dbt_keyfield is required but not defined" 2023-02-20 12:57:14 +01:00
Guenter Lukas
36e73280bf FIX:#23966 Error "Param dbt_keyfield is required but not defined" 2023-02-20 12:51:15 +01:00
Quentin VIAL-GOUTEYRON
b9fc6d5a2f fix travis 2023-02-20 12:01:42 +01:00
stickler-ci
66b5917013 Fixing style errors. 2023-02-20 10:50:52 +00:00
Quentin VIAL-GOUTEYRON
80199faf1a FIX filter sql accounting account 2023-02-20 11:27:14 +01:00
Laurent Destailleur
35d496de38
Update user.class.php 2023-02-19 02:41:53 +01:00
Regis Houssin
50721f8df3 TODO object $user parameter is not use in send_password() ! 2023-02-18 16:31:59 +01:00
Regis Houssin
5b81880b97 FIX object $user is not defined 2023-02-18 16:24:56 +01:00
Regis Houssin
992fe1286d FIX request new password with "mc" and "twofactor" authentication 2023-02-18 16:08:19 +01:00
Laurent Destailleur
83071df214 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:22:17 +01:00
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
Laurent Destailleur
481edd95fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:58 +01:00
Laurent Destailleur
aefe12f01b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:46 +01:00
Laurent Destailleur
3ba63aec78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:01 +01:00
Laurent Destailleur
884ecc9e87 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-17 16:14:37 +01:00
Laurent Destailleur
711bf2e6a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-17 16:14:23 +01:00
Laurent Destailleur
b74839b4c1
Merge pull request #23797 from glu000/16.0-issue-23795
Fix #23795 External users are not able to open proposals
2023-02-17 16:13:58 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
2023-02-17 00:10:00 +01:00
Eric Seigne
bf9a44ac6f msg is not defined 2023-02-16 21:48:55 +01:00
Eric Seigne
86e2f46fe7 addr_bcc could be set 2023-02-16 21:46:27 +01:00
Eric Seigne
3a58e025ba better logs 2023-02-16 21:44:38 +01:00
Laurent Destailleur
396c7b5d33
Merge pull request #23904 from hregis/fix_php8_compatibility
FIX multicompany compatibility
2023-02-16 21:36:09 +01:00
Laurent Destailleur
a7d79a1f75
Merge pull request #23913 from simnandez/15.0
Fix Bad assignation for external users access
2023-02-16 21:11:37 +01:00
Laurent Destailleur
7cefd3c6ec
Merge pull request #23919 from hregis/fix_multiple_php8_compatibility
FIX wrong url param name action
2023-02-16 21:10:35 +01:00
Regis Houssin
33e345a280 FIX missing getEntity filter 2023-02-16 15:51:55 +01:00
stickler-ci
390e7c83b2 Fixing style errors. 2023-02-16 10:48:41 +00:00
GregM
9e1b8bcd4c FIX parse error and NAN 2023-02-16 11:33:43 +01:00
Alexandre SPANGARO
f24ffe5b91 Supplier proposal - List - SQL error on total_ht 2023-02-16 10:20:37 +01:00
Eric Seigne
6163f84d25 move log after variable updates to get good informations in logs 2023-02-15 22:10:03 +01:00
Laurent Destailleur
94002bf85c Fix sql 2023-02-15 20:38:38 +01:00
Laurent Destailleur
c259ca09b8 Enhance script to repair database when stock by lot differ from stock 2023-02-15 20:14:48 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
89817c8ead Fix message for profit calculation 2023-02-15 18:17:06 +01:00
Laurent Destailleur
b57d1ed263 FIX Profit calculation on project preview tab. 2023-02-15 18:16:54 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
d04043f3d8 FIX Profit calculation on project preview tab. 2023-02-15 18:04:23 +01:00
Laurent Destailleur
1b925ec53f FIX Profit calculation on project preview tab. 2023-02-15 17:59:27 +01:00
Regis Houssin
7653a7126b FIX wrong url param name action 2023-02-15 13:50:24 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Laurent Destailleur
7db2c9706d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-14 10:59:23 +01:00
Regis Houssin
89a2f7a0c1 FIX multicompany compatibility 2023-02-14 10:53:59 +01:00
Laurent Destailleur
3278b7bc86 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-13 23:38:07 +01:00
Laurent Destailleur
6eda0f4c2e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-02-13 21:58:26 +01:00
Laurent Destailleur
5217ae28f8 Fix load of margin infos 2023-02-13 21:35:48 +01:00
Laurent Destailleur
b8aad7d760
Merge pull request #23894 from altairis-benjamin/isArray
FIX bad check on if in get_all_ways
2023-02-13 18:10:11 +01:00
Laurent Destailleur
b40cd67fa8
Merge pull request #23878 from hregis/fix_can_not_set_prospect_status
FIX Object of class LDAP\Connection could not be converted to string
2023-02-13 18:05:37 +01:00
Eric Seigne
cac9a00bac fix loi de finance 525 2023-02-13 16:19:00 +01:00
Benjamin Falière
c3fc14a45a FIX bad check on if in get_all_ways 2023-02-13 16:05:12 +01:00
Laurent Destailleur
e9c5f515ce Fix #huntrb1412070-740e-4119-8e4b-61bdc3af42aa 2023-02-13 14:35:02 +01:00
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
f569048eb2 Fix #hunter7a048bb7-bfdd-4299-931e-9bc283e92bc8 2023-02-13 13:54:28 +01:00
Regis Houssin
9c706061be FIX Object of class LDAP\Connection could not be converted to string 2023-02-11 08:48:09 +01:00
Laurent Destailleur
23b4e999fb Better sql for unique index 2023-02-10 19:44:34 +01:00
Laurent Destailleur
1e2a3ffa5d
Merge pull request #23858 from elcf/16.0-uk
Merge pull request #23817 from elcf/develop
2023-02-10 19:42:35 +01:00
Alexandre SPANGARO
c61326cdae Merge branch '14.0' into 14p42 2023-02-10 15:01:29 +01:00
Alexandre SPANGARO
1bc16f47c0 FIX : Missing right to edit service note when module product is disabled 2023-02-10 15:00:27 +01:00
Laurent Destailleur
7358dfa20f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 23:20:09 +01:00
Laurent Destailleur
73b894dca3 Fix the qty in stock when product has no lot 2023-02-09 23:19:58 +01:00
Laurent Destailleur
802ee770c3 FIX #23860 2023-02-09 19:25:55 +01:00
Laurent Destailleur
6362e3612b
Merge pull request #23856 from atm-quentin/FIX_16.0_strato_pdf
FIX strato pdf
2023-02-09 18:18:25 +01:00
Florian HENRY
8bd6f070aa FIX: product ref fourn same size in supplier order/invoice as in product price fourn 2023-02-09 17:22:45 +01:00
Laurent Destailleur
69b690c45e Merge pull request #23817 from elcf/develop
Added key name to unique constraint
2023-02-09 11:36:41 -04:00
Laurent Destailleur
393f3a9480
Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage
FIX: fatal error on clicktodial backtopage
2023-02-09 15:40:28 +01:00
Laurent Destailleur
365c442f70 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 15:30:09 +01:00
Laurent Destailleur
ec8aacaddb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 15:30:05 +01:00
stickler-ci
78e1fad6bd Fixing style errors. 2023-02-09 14:27:50 +00:00
Laurent Destailleur
6cb6098d3c
Merge pull request #23818 from altairis-benjamin/discountOnBom
FIX discount wasn't taken into account when adding a line in BOM
2023-02-09 15:27:46 +01:00
Quentin VIAL-GOUTEYRON
e83559afb0 FIX strato pdf 2023-02-09 15:20:07 +01:00
Laurent Destailleur
cbbbd640d3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:15:36 +01:00
Laurent Destailleur
f8efc35531 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:15:20 +01:00
Laurent Destailleur
d221aa3f95
Merge pull request #23826 from Easya-Solutions/14.0_fix_prelevement_line_facture_fourn_link
Fix prelevement line : the link to the facture was to a customer fac, not fourn fac
2023-02-09 15:11:00 +01:00
Laurent Destailleur
698693ee8b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:04:06 +01:00
Laurent Destailleur
ac27f5ef74 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 14:46:45 +01:00
VESSILLER
01e0503b0f FIX several email sent to the same recipient when adding message from ticket 2023-02-09 11:52:41 +01:00
stickler-ci
637603731a Fixing style errors. 2023-02-08 15:26:10 +00:00
avolani
98bfba1f46
Add missing table_element
This allow usage of extrafields logic (still missing table and setup pages)
2023-02-08 16:20:47 +01:00