Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,113 Commits 35 Branches 179 Tags 1.7 GiB
cbfbb88a84
Commit Graph

112113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
ba5cc3870e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:01 +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
94fb344bd6 FIX #22271 2023-01-03 02:03:23 +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
1546bdfc78
Merge pull request #23381 from fappels/16_fix_price_by_qty_multiprices 
Fix Price by qty for multiprices
 2023-01-02 00:18:30 +01:00
Francis Appels
cef9a8e8d4 Fix Price by qty for multiprices 2022-12-31 13:42:18 +01:00
Laurent Destailleur
534db40d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 04:15:10 +01:00
Laurent Destailleur
dfa13ea255 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 03:11:10 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +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
6cb364faf8
Merge pull request #23312 from ksar-ksar/patch-19 
FIX #23281
 2022-12-28 02:39:01 +01:00
Laurent Destailleur
d0ea4760d9
Update perms.php 2022-12-28 02:38:40 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +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
6551b8afcc Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:28:11 +01:00
Laurent Destailleur
bbb775bd11 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:27:46 +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
ksar
1b03c423b9
FIX #23281 2022-12-22 17:13:11 +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
2b106519e2
Merge pull request #23269 from inovea-conseil/FIX#23072 
FIX#23072
 2022-12-22 14:28:16 +01:00
Laurent Destailleur
5e7a8012f5
Merge pull request #23262 from inovea-conseil/FIX23238 
When no language selected, value is 0 so it enters in the condition f…
 2022-12-22 13:53:35 +01:00
Laurent Destailleur
5dfd9af695 Removed not required rm 2022-12-22 01:07:02 +01:00
Laurent Destailleur
c7ae67a9be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-22 01:04:56 +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
dc1c31c948 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 21:00:57 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +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
Laurent Destailleur
f87b6d7ede
Merge pull request #23260 from braito4/patch-2 
php 8 warning
 2022-12-21 20:45:38 +01:00
Laurent Destailleur
1681674cdf
Update card.php 2022-12-21 20:45:11 +01:00