Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
367987e2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:19:39 +01:00
Laurent Destailleur
e27875142c Merge pull request #23465 from Easya-Solutions/14.0_fix-muscadet-hide-details
FIX hide details option in supplier order PDF model
2023-01-11 21:15:40 +01:00
Sébastien NASSIET
2bce74d2e2 Merge branch 'Dolibarr:16.0' into 16.0 2023-01-11 21:07:31 +01:00
Sébastien NASSIET
4a40039f56 correction bug selection contact dans emailing 2023-01-11 21:06:55 +01:00
Laurent Destailleur
a0e723a05b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:19 +01:00
Laurent Destailleur
356accd6ee Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:09 +01:00
Laurent Destailleur
a2f7ef6123 Merge pull request #23467 from Hystepik/develop_v15#1
Fix #23466 : fix public payement pages ko and ok
2023-01-11 20:58:33 +01:00
Laurent Destailleur
ed6a46eb20 Merge pull request #23504 from atm-maxime/fix_invoicesupprec_pdfmodel
Fix supplier reccurent invoice if no pdf model
2023-01-11 19:25:22 +01:00
Laurent Destailleur
74501fb20e Merge pull request #23511 from noec764/FIX_Ecmfile_Ref
FIX: ref not available after ecmFiles::create()
2023-01-11 19:08:39 +01:00
Laurent Destailleur
72adeb3b6d Merge pull request #23516 from FHenry/16_fix_volume_pdf
fix: display True volume in PDF
2023-01-11 19:06:55 +01:00
Florian HENRY
45725a1e97 fix: display True volume in PDF 2023-01-11 17:58:26 +01:00
Noé Courtier
cfb16cc9cd FIX: ref not available after ecmFile create() 2023-01-11 16:49:59 +01:00
Maxime Kohlhaas
c0a7bca04e Fix supplier reccurent invoice if no pdf model 2023-01-11 10:50:58 +01:00
Laurent Destailleur
85bc712867 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-10 11:33:48 +01:00
Laurent Destailleur
2da8c1d9bc Fix rounding 2023-01-10 11:33:17 +01:00
Laurent Destailleur
ce556d56c0 Fix rounding 2023-01-10 11:32:21 +01:00
Florian HENRY
403f5a33ee Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16_fix_reminder_type_label 2023-01-09 16:15:39 +01:00
Laurent Destailleur
ccf231bc44 Fix sql error 2023-01-09 16:01:20 +01:00
Florian HENRY
6c373c9381 fix: reminder type label 2023-01-09 15:50:55 +01:00
hystepik
4e0ea65c43 Fix #23466 : fix public payement pages ko and ok 2023-01-09 15:37:10 +01:00
VESSILLER
4c9d6b5e51 FIX hide details option in supplier order PDF model 2023-01-09 13:57:20 +01:00
Laurent Destailleur
98e61dc40d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 17:29:24 +01:00
Laurent Destailleur
dc5f92cad5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 11:29:54 +01:00
Laurent Destailleur
192d641b26 Update for doxygen generation from command line 2023-01-07 11:29:43 +01:00
Laurent Destailleur
b2e51a5ef4 Merge pull request #23419 from atm-jpb/fix_border_left_photo
FIX : add border left on image product when conf activated
2023-01-07 10:28:47 +01:00
Laurent Destailleur
7218d8419f Merge pull request #23434 from altairis-noe/too_much_br
FIX: do not add <br> when dol_concatdesc already does it
2023-01-07 03:38:57 +01:00
Laurent Destailleur
0eb0ee5bb1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-06 16:52:06 +01:00
Laurent Destailleur
2755e3dad7 Fix typo 2023-01-06 15:53:25 +01:00
Laurent Destailleur
099a9e5253 Merge pull request #23425 from marcusdeangabriel/16.0
Added &$arrayfields to $parameters so that hooks can manipulate list columns.
2023-01-06 15:52:19 +01:00
Laurent Destailleur
81e39646ac Merge pull request #23426 from atm-gauthier/fix_hierarchyme_on_activity_permonth
FIX : hierarchyme and not hierachyme
2023-01-06 15:48:38 +01:00
Laurent Destailleur
b8c8a5d487 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-06 12:09:33 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the
rate was saved instead)
2023-01-06 12:08:40 +01:00
Noé Cendrier
10018d48a9 do not add <br> when dol_concatdesc already does it 2023-01-06 11:46:59 +01:00
Gauthier PC portable 024
e7d31a821c FIX : hierarchyme and not hierachyme 2023-01-05 15:41:57 +01:00
Laurent Destailleur
a892ef56ab Merge pull request #23422 from Dolibarr/fix_fatal_error_on_task_list_time_to_bill
FIX #23420 : wrong check on $search_categ value causing FATAL ERROR
2023-01-05 14:47:43 +01:00
mgabriel
a7de5e4c72 Added &$arrayfields to $parameters so that hooks can manipulate list columns. 2023-01-05 11:59:43 +01:00
Théo David
665fd9cc0e FIX : wrong check on $search_categ value causing fatal error 2023-01-05 10:46:08 +01:00
jpb
9a755d8d50 add border left on image product when conf activated 2023-01-05 10:24:17 +01:00
Laurent Destailleur
25eac607eb Merge pull request #23407 from daraelmin/daraelmin-patch-2
Fix v14 fatal error undefined fct lenght_accounta
2023-01-04 17:48:08 +01:00
Laurent Destailleur
cbfbb88a84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:28 +01:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Laurent Destailleur
539d4936aa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-04 15:17:00 +01:00
Laurent Destailleur
7197085126 FIX saving of numbering module for jobs 2023-01-04 15:16:40 +01:00
stickler-ci
1d29400cdf Fixing style errors. 2023-01-04 08:15:39 +00:00
daraelmin
23d535197d Fix v14 fatal error undefined fct lenght_accounta
Following #23403
See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914
2023-01-04 09:13:40 +01:00
Laurent Destailleur
f32da6a28a Merge pull request #23397 from FHenry/15_fixdelete_ecm_on_product_delete
fix: delete cem data on product deletion
2023-01-04 08:12:11 +01:00
Laurent Destailleur
2f63bb29ee Merge pull request #23402 from ptibogxiv/patch-63
Fix error when no category selected
2023-01-04 08:08:33 +01:00
ptibogxiv
70f9e7881b Fix error when no category selected
empty pages when searching with no category of producted selected
2023-01-03 19:46:05 +01:00
Florian HENRY
797b9c9054 dfelete cem data on product deletion 2023-01-03 11:42:39 +01:00
Laurent Destailleur
deb110d556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:13 +01:00