Commit Graph

13584 Commits

Author SHA1 Message Date
Laurent Destailleur
4dc5483b12 Fix warning 2023-12-17 23:54:08 +01:00
Laurent Destailleur
a50bb45d24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:02:03 +01:00
Laurent Destailleur
bb65d9520d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 23:01:21 +01:00
Laurent Destailleur
22c93cb029 Fix phpcs 2023-12-17 22:59:15 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
2023-12-17 22:17:14 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Laurent Destailleur
2cb4dd29f8 Fix td balance 2023-12-15 19:06:21 +01:00
Laurent Destailleur
540c69e303 Debug v19 2023-12-15 19:02:53 +01:00
Laurent Destailleur
f9a9b3610e Fix missing total 2023-12-15 18:53:55 +01:00
Laurent Destailleur
f5a58e7693 Fix warnings 2023-12-15 14:20:54 +01:00
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Laurent Destailleur
71f721fbd9 Fix warning 2023-12-15 12:31:07 +01:00
Laurent Destailleur
d92c65ad91 FIX infinite loop in API call/trigger by adding a caller 2023-12-15 12:15:33 +01:00
Laurent Destailleur
03c05b4fd8 Debug v19 2023-12-14 18:05:46 +01:00
Laurent Destailleur
80576444f7 Debug v19 2023-12-14 16:00:05 +01:00
Laurent Destailleur
20a934d724 Fix sql error 2023-12-14 15:32:23 +01:00
Laurent Destailleur
2aced0faaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-14 14:52:34 +01:00
Laurent Destailleur
14ba1138c4 Fix payment SEPA for salary 2023-12-14 14:51:30 +01:00
Laurent Destailleur
33dd878f9e Fix payment SEPA for salary 2023-12-14 14:48:22 +01:00
Laurent Destailleur
d5722ee4b2 Fix payment SEPA for salary 2023-12-14 13:50:29 +01:00
Laurent Destailleur
a976620d62 Fix load language 2023-12-14 00:25:46 +01:00
Laurent Destailleur
3a7379531f Fix trans 2023-12-14 00:23:25 +01:00
Laurent Destailleur
0a2e28435e Debug v19 2023-12-13 20:33:36 +01:00
Laurent Destailleur
fe99114fc1 Debug v19 2023-12-13 19:42:23 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
4c7dfea535 Clean code 2023-12-12 01:40:26 +01:00
Laurent Destailleur
df7fc7cd4e Debug v19 2023-12-11 23:58:47 +01:00
Laurent Destailleur
c4dc94fd35 Fix warning 2023-12-11 18:22:35 +01:00
Laurent Destailleur
d63aeeed9f Debug v19 2023-12-09 20:41:56 +01:00
Laurent Destailleur
100a657633 Debug v19 - Support of bank payment rejection on SEPA. 2023-12-09 20:28:28 +01:00
Laurent Destailleur
02735fab0a Debug v19 2023-12-09 19:20:19 +01:00
Laurent Destailleur
e6bdd3ffbf Debug v19 2023-12-09 17:53:32 +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
9d479c5df0 Debug v19 2023-12-08 21:39:10 +01:00
Laurent Destailleur
d248840779 Debug v19 2023-12-08 21:09:32 +01:00
Laurent Destailleur
01a207a592 Debug v19 2023-12-08 20:57:01 +01:00
Laurent Destailleur
230371a6c9 Debug v19 2023-12-08 19:08:42 +01:00
Laurent Destailleur
603ec5e6ec
Merge pull request #26943 from xabitrigo/API_GET_bankaccount_links
CLOSE #26942 Add REST API endpoint: GET /bankaccounts/{id}/lines/{line_id}/links
2023-12-08 02:09:22 +01:00
Laurent Destailleur
60af6843fd Clean code 2023-12-08 02:05:51 +01:00
Laurent Destailleur
89e1e1b859
Merge pull request #26980 from atm-jonathan/FIX_in_array()_list.php
FIX in_array() on key
2023-12-08 01:59:32 +01:00
Laurent Destailleur
8a90fc2735
Merge pull request #27013 from defrance/patch-294
php V8 warning
2023-12-08 01:35:58 +01:00
Laurent Destailleur
eb69a66da0
Update bankentries_list.php 2023-12-08 01:35:43 +01:00
Laurent Destailleur
fdbf437d6e Fix warning 2023-12-08 01:34:52 +01:00
Laurent Destailleur
db71fd54cc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:34 +01:00
Laurent Destailleur
dfc79f3673 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:19:21 +01:00
Laurent Destailleur
b741db349e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-07 16:18:31 +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