Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
107,591 Commits 39 Branches 191 Tags
cfede65ca051d4bec9fbd2d5f8656eae7d53d64e
Commit Graph

107591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cfede65ca0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-13 11:15:52 +01:00
Laurent Destailleur
597dfc04b7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-01-13 11:14:55 +01:00
Laurent Destailleur
5d42bbc86a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-01-13 11:14:47 +01:00
Laurent Destailleur
a06a5d0f65 Fix lang file not loaded 2023-01-13 11:09:06 +01:00
Laurent Destailleur
684716e15b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-12 11:43:43 +01:00
Laurent Destailleur
849fd56616 Merge pull request #23522 from hregis/fix_compatibility_with_multicompany 
FIX wrong stock list with multicompany and without stock sharing
 2023-01-12 10:04:32 +01:00
Regis Houssin
968c50d6f9 FIX wrong stock list with multicompany and without stock sharing 2023-01-12 09:49:12 +01:00
Laurent Destailleur
e1ea849701 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:20:10 +01:00
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
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
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
Noé Courtier
cfb16cc9cd FIX: ref not available after ecmFile create() 2023-01-11 16:49:59 +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
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
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
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
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
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
Florian HENRY
797b9c9054 dfelete cem data on product deletion 2023-01-03 11:42:39 +01:00
Laurent Destailleur
10674a59bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-03 02:33:59 +01:00
Laurent Destailleur
af45ef8799 Merge pull request #23294 from atm-gauthier/fix_multicurrency_when_create_order_from_propal 
FIX : get multicurrency infos of propal when create order from propal…
 2023-01-03 01:36:57 +01:00
Laurent Destailleur
fa3b4e92c5 Merge pull request #23362 from rycks/update_retainedwarranty_only_if_draft_invoice 
avoid editretainedwarranty if invoice is not draft
 2022-12-28 18:18:29 +01:00
Eric Seigne
2aa271d96e avoid editretainedwarranty if invoice is not draft 2022-12-28 17:50:16 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205 Merge pull request #23018 from Easya-Solutions/14.0_fix-22837 
FIX #22837
 2022-12-27 00:26:52 +01:00
Laurent Destailleur
1d7c550adb Fix add BARCODE_INIT_MAX to solve timeout in barcode generation 2022-12-26 16:09:05 +01:00
Laurent Destailleur
04b38997c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:21:22 +01:00
Laurent Destailleur
76b7f80443 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:20:28 +01:00
Laurent Destailleur
11c86416a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-12-26 15:15:13 +01:00
Laurent Destailleur
f6149903dc FIX bad selection of barcode numbering module 2022-12-26 15:08:51 +01:00
Laurent Destailleur
e12ef6735f Merge pull request #23250 from daraelmin/patch-7 
Fix #23077 - Cannot update subscription note
 2022-12-22 14:40:57 +01:00
Laurent Destailleur
e75617268b Log 2022-12-22 01:04:06 +01:00
Laurent Destailleur
bd90d783c7 Reduce code 2022-12-22 00:48:56 +01:00
Laurent Destailleur
599aa6009a Try to solve phpunit regression 2022-12-22 00:37:33 +01:00
Laurent Destailleur
49e8b53fab Try fix for phpunit regression 2022-12-22 00:33:03 +01:00
Laurent Destailleur
d29fde6603 Add log to test phpunit pb 2022-12-22 00:02:22 +01:00
Laurent Destailleur
a0f282d100 Try a fix of phpunit regression 2022-12-21 23:34:32 +01:00
Laurent Destailleur
8e914b2423 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:47:09 +01:00
Laurent Destailleur
c3ada976e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:46:56 +01:00
Gauthier PC portable 024
2c7e0afabd FIX : travis 2022-12-21 17:17:33 +01:00
Gauthier PC portable 024
69b0cf9bcf FIX : include class multicurrency 2022-12-21 14:05:54 +01:00
Gauthier PC portable 024
b38f163b02 Merge branch 'fix_multicurrency_when_create_order_from_propal' of github.com:atm-gauthier/dolibarr into fix_multicurrency_when_create_order_from_propal 2022-12-21 12:31:48 +01:00