vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
108034 commits 1 branch 0 tags 1.5 GiB
Commit graph

108034 commits

This branch
This branch
All branches
Author SHA1 Message Date
Regis Houssin
fb69347ea7
FIX CVE-2024-23817 (#28089) 
* FIX CVE-2024-23817

* FIX syntax error
 2024-02-09 11:24:57 +01:00
Laurent Destailleur
efa977bd21 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:39 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Laurent Destailleur
662ab45037
Merge pull request #27904 from rycks/14.0_fix_zero_could_be_a_value_into_conf_global_key 
fix #27883 : zero could be a value stored
 2024-02-01 10:59:11 +01:00
Laurent Destailleur
356bb80676
Merge pull request #27903 from rycks/14.0_fix_datehour_to_datetime_comment 
fix comment about datehour -> datetime
 2024-01-30 23:47:44 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Eric Seigne
8d9ddf4a51 fix comment about datehour -> datetime 2024-01-30 21:35:19 +01:00
Laurent Destailleur
2420794b94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-29 01:10:46 +01:00
Laurent Destailleur
2f18dc1b9c
Merge pull request #27834 from Easya-Solutions/14.0_takepos_display_errors_on_payment_error 
Takepos : display errors on payment error
 2024-01-28 12:44:37 +01:00
tnegre
9c638968ff Takepos : display errors on payment error 2024-01-26 16:23:24 +01:00
Laurent Destailleur
9778e4ad08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-23 22:02:01 +01:00
Laurent Destailleur
18b896f034
Merge pull request #27740 from MaximilienR-easya/14.0_Fix_expedition_filter 
Fix expedition list filter on product category
 2024-01-23 17:14:03 +01:00
mrozniecki
951535a3d5 Fix expedition list filter on product category 2024-01-23 09:36:15 +01:00
Laurent Destailleur
7c0ccba344 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-18 15:58:19 +01:00
Laurent Destailleur
f3f6515c72
Merge pull request #27543 from rycks/14.0_end_fix_10417_custom_num_payment 
end fix #10417 : custom payment number for supplier invoices
 2024-01-15 19:36:08 +01:00
Eric Seigne
5a04b2393d end fix #10417 : custom payment number for supplier invoices 2024-01-15 18:43:17 +01:00
Laurent Destailleur
52508fbac7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-02 14:46:12 +01:00
Laurent Destailleur
0dffaa53dd Fix doc 2024-01-02 14:45:49 +01:00
Laurent Destailleur
0329bbc0cb Merge 2024-01-02 14:37:25 +01:00
Laurent Destailleur
086da9f73f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-01-02 14:34:34 +01:00
Laurent Destailleur
adf9fcb290
Merge pull request #27205 from rycks/13.0_fix_multiple_autoloader_collision_with_restler 
next fix for  #17665 : autoloader collision
 2023-12-27 14:41:33 +01:00
Laurent Destailleur
46dc264654
Update dolibarr_changes.txt 2023-12-27 14:40:16 +01:00
Eric Seigne
23e39cb8b3 update changes 2023-12-22 11:05:17 +01:00
Eric Seigne
40329db2b2 next fix for #17665 : autoloader collision 2023-12-21 18:20:05 +01:00
Laurent Destailleur
c5ccf54572
Merge pull request #26525 from marc-dll/15.0_FIX_sql_select_replacement 
FIX: more correctly parse the select part to be replaced in sql queries
 2023-12-09 00:17:42 +01:00
Laurent Destailleur
2eb2437793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-07 16:17:39 +01:00
Laurent Destailleur
0c2bcfa79e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-12-07 16:16:34 +01:00
Laurent Destailleur
ea7afeb007 Fix warning 2023-12-07 16:16:22 +01:00
Laurent Destailleur
61591d8094
Merge pull request #26976 from rycks/14.0_fix_create_bank_account_with_empty_solde_field 
fix sql error in case of balance is empty
 2023-12-06 15:52:53 +01:00
Eric Seigne
5601fab14f fix sql error in case of balance is empty 2023-12-05 10:41:02 +01:00
Laurent Destailleur
09da842b68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-02 12:44:33 +01:00
Laurent Destailleur
a79e016321
Merge pull request #26906 from rycks/14.0_fix_join_file_on_sendEmailsRemindersOnInvoiceDueDate 
fix #26862 but on 14.0 where that bug was present
 2023-12-02 12:42:59 +01:00
Eric Seigne
d6c97bd75e check if last_main_doc is not empty 2023-11-30 19:17:14 +01:00
Eric Seigne
951afdcb68 cleanup 2023-11-30 19:15:56 +01:00
Eric Seigne
7782ae4fd0 fix #26862 but on 14.0 where that bug was present 2023-11-30 19:12:26 +01:00
Laurent Destailleur
0925cff352 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-23 18:42:42 +01:00
Laurent Destailleur
19450554b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-23 18:41:52 +01:00
Laurent Destailleur
887d0a5d01 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-11-23 18:41:18 +01:00
Laurent Destailleur
e2b5315e23 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2023-11-23 18:40:52 +01:00
Laurent Destailleur
2609f0dac5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-23 18:40:29 +01:00
Marc de Lima Lucio
786ea1029e FIX: more correctly parse the select part to be replaced in sql queries, part 2 2023-11-18 12:40:10 +01:00
Maxime Kohlhaas
a680d1e34d
Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
Alexandre SPANGARO
cc452f2136
FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound (#26545) 
* FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound

* Update expensereportsjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-12 22:16:47 +01:00
Marc de Lima Lucio
a3fa8b82fa FIX: more correctly parse the select part to be replaced in sql queries 2023-11-09 17:04:13 +01:00
lvessiller-opendsi
785c85205b
FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +01:00
Laurent Destailleur
05f42d1341 Fix phpcs 2023-11-08 11:15:23 +01:00
Pichi1966
7a7869aeb3
FIX # Bug Estimated Stock at date value in V14 (#26479) 
In stockatdate page, the estimatedvalue is wrong. Backport of V17 solution as explained in #23782
 2023-11-07 18:10:37 +01:00
Laurent Destailleur
e64d1f6e46 Fix phpcs 2023-11-06 00:16:26 +01:00
Laurent Destailleur
cfe1b17a76 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-05 19:47:33 +01:00