lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
112,186 Commits 43 Branches 150 Tags 886 MiB
a00fa5a192
Commit Graph

112186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferran Marcet
a00fa5a192 FIX: Do not convert negative line to discount if variable is active 2023-01-18 16:11:22 +01:00
Laurent Destailleur
af7570a2cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:16:03 +01:00
Laurent Destailleur
24bc8d022f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:14:24 +01:00
Laurent Destailleur
708e284381 Enhance backward compatibility 2023-01-18 00:13:21 +01:00
Laurent Destailleur
1d632a0c02
Merge pull request #23585 from FHenry/16_fix_missing_token 
FIX: missing token on Supplier proposal links
 2023-01-17 18:03:29 +01:00
Florian HENRY
dbc9ca9816 FIX: missing token on Supplier proposal links 2023-01-16 22:17:22 +01:00
Florian HENRY
90137268a1 FIX: missing tokan on Supplier proposal links 2023-01-16 22:15:02 +01:00
Laurent Destailleur
ebaae53335
Merge pull request #23526 from FHenry/16_fix_volume_pdf 
Fix: make PDF custom volume work as it work on expedition/card.php
 2023-01-13 21:04:18 +01:00
Laurent Destailleur
a67fe03aed
Merge pull request #23551 from Hystepik/develop_v16#1 
Fix #23531 : fix update bom line
 2023-01-13 20:45:09 +01:00
Laurent Destailleur
dd0f885765
Merge pull request #23217 from atm-lena/16.0_FIXBOM_CalculatePrice 
16.0 FIX Bom Calculate Price
 2023-01-13 20:43:55 +01:00
Laurent Destailleur
40e956646d
Merge pull request #23523 from altairis-noe/status_for_inventory_update 
FIX: do not let closed inventories reset stock with URL
 2023-01-13 13:22:47 +01:00
hystepik
04ce79191f Fix #23531 : fix update bom line 2023-01-13 12:18:58 +01:00
Laurent Destailleur
efa9b4da33
Merge pull request #21528 from atm-GregM/FIX_dolibarr_15.0_disabled_contacts_not_returned_create_invoice 
FIX contacts disabled are not returned on create invoice
 2023-01-13 12:17:40 +01:00
Laurent Destailleur
8125a04d7e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-13 11:17:04 +01:00
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
Florian HENRY
4fdf930269 make PDF custom volume work as it work on expedition/card.php 2023-01-12 12:49:45 +01:00
Laurent Destailleur
24651aaa6c FIX #22731 #23524 2023-01-12 12:41:02 +01:00
Laurent Destailleur
ce934a813b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-12 11:48:58 +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
Noé Cendrier
272f131b07 do not let closed inventories reset stock with URL 2023-01-12 10:18:47 +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
2ec9d9d409 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:21:15 +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
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
Laurent Destailleur
ccf231bc44 Fix sql error 2023-01-09 16:01:20 +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