Commit Graph

14020 Commits

Author SHA1 Message Date
Laurent Destailleur
d4cda09794 Debug v18 2023-07-10 02:25:33 +02:00
Laurent Destailleur
0a939e579c Merge pull request #25186 from Hystepik/develop#3
New : mass modification of status for coferenceorbooth
2023-07-09 14:59:28 +02:00
Laurent Destailleur
ef31cf34ff Fix duplicate string 2023-07-09 13:24:43 +02:00
Laurent Destailleur
b7c71aea1c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-09 13:22:16 +02:00
Laurent Destailleur
8308a90df7 Move term 2023-07-09 13:21:27 +02:00
Kamel Khelifa
8a3c0491ec FIX: Fix errors or missing langs for MO and BOM 2023-07-07 16:46:11 +02:00
VESSILLER
f8c8d9a1c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-productlot-make-sell-or-eat-by-mandatory2 2023-07-07 14:16:08 +02:00
Laurent Destailleur
b10e7b9d57 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-06 22:10:18 +02:00
Laurent Destailleur
6465aefff7 Sync transifex 2023-07-04 12:10:58 +02:00
Laurent Destailleur
325d4947a1 Trans 2023-07-04 11:09:53 +02:00
Laurent Destailleur
24e6f82037 Trans 2023-07-04 02:27:57 +02:00
Laurent Destailleur
34f3ecd49e Trans 2023-07-03 18:04:00 +02:00
Laurent Destailleur
df4d26a805 Trans 2023-07-03 16:50:23 +02:00
Laurent Destailleur
f02c89dad0 Fix warning 2023-07-01 16:14:40 +02:00
Laurent Destailleur
024b86e864 Trans 2023-06-29 11:31:38 +02:00
Laurent Destailleur
a5d5847e04 Clean code 2023-06-29 11:20:19 +02:00
Laurent Destailleur
28b7f7d20a Fix remove foreign key on user
Transifex sync
2023-06-27 13:56:18 +02:00
Laurent Destailleur
f5da656a64 Trans 2023-06-27 12:04:45 +02:00
Adrien Raze
0d759e8090 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2023-06-26 10:46:13 +02:00
Laurent Destailleur
0c988e8ce1 Update admin.lang 2023-06-25 01:44:30 +02:00
Hystepik
1395a9ff8f New : mass modification of status for coferenceorbooth 2023-06-23 16:32:01 +02:00
Laurent Destailleur
47d586b109 Merge pull request #25179 from DATUC/patch-28
Update companies.lang
2023-06-23 02:34:25 +02:00
Laurent Destailleur
d67c98a275 Merge pull request #25178 from DATUC/patch-27
Update companies.lang
2023-06-23 01:46:14 +02:00
Laurent Destailleur
bcdddc2c1c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-22 21:31:26 +02:00
DATUC
d3e64c8899 Update companies.lang
Update local CM ref in English ProfId
2023-06-22 15:49:39 +01:00
DATUC
aa07a80ec0 Update companies.lang
Update local CM ref in french ProfId
2023-06-22 15:44:22 +01:00
Hystepik
af6424fd4b Fix #25150 : add trans for api permission 2023-06-20 15:02:19 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
886eaa9117 Fix error management and better merging behaviour 2023-06-15 12:48:12 +02:00
Laurent Destailleur
c67ea96e19 FIX Multicompany for SEPA file generation 2023-06-14 15:09:36 +02:00
Alexandre SPANGARO
30da01a599 FIX Accountancy - Closure - Button is hidden... 2023-06-10 21:41:29 +02:00
Jean
751d918576 FIX #25046 user landing page url setting 2023-06-10 12:29:36 +02:00
Laurent Destailleur
332ab226aa Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/langs/en_US/ticket.lang
2023-06-10 12:13:46 +02:00
Nicolas
455293da94 FIX #24695 2023-06-09 10:08:09 +02:00
Florian HENRY
3c4548120b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-06-08 23:34:01 +02:00
Laurent Destailleur
e1169091e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/js/lib_head.js.php
2023-06-08 23:33:45 +02:00
Alexandre SPANGARO
217b3d6f59 FIX Donation - Missing Language key 2023-06-08 21:58:30 +02:00
VESSILLER
b915611de3 Fix resolve conflicts 2023-06-08 08:50:07 +02:00
Laurent Destailleur
e9c17980f9 Trans 2023-06-05 23:59:33 +02:00
Lamrani Abdel
0f4feec3ff fix some problems 2023-06-05 16:15:52 +02:00
Florian HENRY
a77f8a43e3 review 2023-06-05 13:56:57 +02:00
Laurent Destailleur
0766bd8e7a Merge pull request #24929 from fappels/18_debug_list_det
Debug Lines of order page.
2023-06-04 17:59:57 +02:00
Laurent Destailleur
6efa2ecfbb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 03:34:49 +02:00
Laurent Destailleur
6c8b5d489f NEW Add option MAIN_ALLOW_LOCAL_LINKS_AS_EXTERNAL_LINKS 2023-06-03 11:20:24 +02:00
Laurent Destailleur
7be8ea782d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
# Conflicts:
#	htdocs/compta/facture/card.php
#	htdocs/fourn/facture/card.php
2023-06-01 08:01:32 +02:00
Laurent Destailleur
faf8f8d19e Debug v18 2023-06-01 07:58:52 +02:00
Laurent Destailleur
f0a4732d0b Fix php 8.2 2023-06-01 07:35:41 +02:00
Francis Appels
1484ac243f Fix translation 2023-05-31 15:36:42 +02:00
VESSILLER
8caa6131df NEW make sell or eat by mandatory in product lot 2023-05-30 08:37:17 +02:00